diff --git a/Android.mk b/Android.mk
index 349b79c..eeaad0c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,9 +22,10 @@
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v4 \
     android-support-v13 \
-    android-support-v7-recyclerview \
-    android-support-v7-preference \
     android-support-v7-appcompat \
+    android-support-v7-cardview \
+    android-support-v7-preference \
+    android-support-v7-recyclerview \
     android-support-v14-preference
 
 LOCAL_JAVA_LIBRARIES := \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c596152..a5affc9 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.SETTINGS_ONLY" />
+                <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.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>
 
-        <!-- Note this must not be exported since it returns the password in the intent -->
-        <activity android:name="ConfirmLockPattern$InternalActivity"
-            android:exported="false"
-            android:theme="@style/SetupWizardTheme.Light"/>
+        <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="ConfirmLockPassword$InternalActivity"
+        <activity android:name=".password.ConfirmLockPattern$InternalActivity"
+            android:exported="false"
+            android:theme="@style/GlifTheme.Light"/>
+
+        <!-- Note this must not be exported since it returns the password in the intent -->
+        <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 f31b023..e21bd9f 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 2014603..f87a882 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -18,7 +18,7 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24"
-        android:tint="?android:attr/colorAccent">
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/res/drawable/ic_apps_vd_theme_24.xml b/res/drawable/ic_apps_vd_theme_24.xml
deleted file mode 100644
index ba59e83..0000000
--- a/res/drawable/ic_apps_vd_theme_24.xml
+++ /dev/null
@@ -1,25 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="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
diff --git a/res/drawable/ic_battery_alert_24dp.xml b/res/drawable/ic_battery_alert_24dp.xml
new file mode 100644
index 0000000..cadd882
--- /dev/null
+++ b/res/drawable/ic_battery_alert_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorError">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.67,4L14,4L14,2h-4v2L8.33,4C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33L17,5.33C17,4.6 16.4,4 15.67,4zM13,18h-2v-2h2v2zM13,14h-2L11,9h2v5z"/>
+</vector>
diff --git a/res/drawable/ic_bt_imaging.xml b/res/drawable/ic_bt_imaging.xml
deleted file mode 100644
index 01e78c0..0000000
--- a/res/drawable/ic_bt_imaging.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<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
diff --git a/res/drawable/ic_chevron_right_24dp.xml b/res/drawable/ic_chevron_right_24dp.xml
new file mode 100644
index 0000000..63532cb
--- /dev/null
+++ b/res/drawable/ic_chevron_right_24dp.xml
@@ -0,0 +1,27 @@
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:tint="?android:attr/colorControlNormal">
+    <path android:fillColor="#FF000000"
+          android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
+</vector>
diff --git a/res/drawable/ic_fingerprint_24dp.xml b/res/drawable/ic_fingerprint_24dp.xml
index 714a05e..e52f0f5 100644
--- a/res/drawable/ic_fingerprint_24dp.xml
+++ b/res/drawable/ic_fingerprint_24dp.xml
@@ -18,7 +18,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?android:attr/colorAccent">
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"
         android:fillColor="#000000"/>
diff --git a/res/drawable/ic_photo_library_vd_theme_24.xml b/res/drawable/ic_local_movies.xml
similarity index 75%
copy from res/drawable/ic_photo_library_vd_theme_24.xml
copy to res/drawable/ic_local_movies.xml
index 3cd97fc..9997723 100644
--- a/res/drawable/ic_photo_library_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="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="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_photo_library_vd_theme_24.xml b/res/drawable/ic_media_stream.xml
similarity index 77%
rename from res/drawable/ic_photo_library_vd_theme_24.xml
rename to res/drawable/ic_media_stream.xml
index 3cd97fc..4eb78bc 100644
--- a/res/drawable/ic_photo_library_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="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="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 0000000..b8fbb20
--- /dev/null
+++ b/res/drawable/ic_new_releases_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path android:fillColor="#FF000000"
+          android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
+</vector>
diff --git a/res/drawable/ic_password.xml b/res/drawable/ic_password.xml
new file mode 100644
index 0000000..57591c2
--- /dev/null
+++ b/res/drawable/ic_password.xml
@@ -0,0 +1,34 @@
+<!--
+    Copyright (C) 2017 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M21.5,9.39l-1.63,0l0.81,-1.42l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0z" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M13.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M6.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M21,17.89H3c-0.28,0 -0.5,-0.22 -0.5,-0.5v-1c0,-0.28 0.22,-0.5 0.5,-0.5h18c0.28,0 0.5,0.22 0.5,0.5v1C21.5,17.66 21.28,17.89 21,17.89z" />
+</vector>
diff --git a/res/drawable/ic_pattern.xml b/res/drawable/ic_pattern.xml
new file mode 100644
index 0000000..003111e
--- /dev/null
+++ b/res/drawable/ic_pattern.xml
@@ -0,0 +1,37 @@
+<!--
+    Copyright (C) 2017 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M4,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M4,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M20,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M20,18c-0.93,0 -1.7,0.64 -1.93,1.5h-4.14c-0.22,-0.86 -1,-1.5 -1.93,-1.5s-1.7,0.64 -1.93,1.5H5.93c-0.05,-0.18 -0.12,-0.35 -0.21,-0.51l5.28,-5.28C11.29,13.89 11.63,14 12,14c1.1,0 2,-0.9 2,-2c0,-0.37 -0.11,-0.71 -0.28,-1.01l5.28,-5.28C19.29,5.89 19.63,6 20,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C12.71,10.11 12.37,10 12,10c-1.1,0 -2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C4.71,18.11 4.37,18 4,18c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c0.93,0 1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5s1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5c1.1,0 2,-0.9 2,-2S21.1,18 20,18z" />
+</vector>
diff --git a/res/drawable/ic_photo_library_vd_theme_24.xml b/res/drawable/ic_photo_library.xml
similarity index 72%
copy from res/drawable/ic_photo_library_vd_theme_24.xml
copy to res/drawable/ic_photo_library.xml
index 3cd97fc..732a348 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 0000000..0176019
--- /dev/null
+++ b/res/drawable/ic_pin.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (C) 2017 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="?attr/suwListItemIconColor"
+        android:pathData="M20,4L4,4A2,2 0,0 0,2 6L2,18a2,2 0,0 0,2 2L20,20a2,2 0,0 0,2 -2L22,6A2,2 0,0 0,20 4ZM7.1,15L5.9,15L5.9,10.2L4.7,10.2L4.7,9L7.1,9v6ZM13.2,11.4A1.2,1.2 0,0 1,12 12.6L10.8,12.6v1.2h2.4L13.2,15L9.6,15L9.6,12.6a1.2,1.2 0,0 1,1.2 -1.2L12,11.4L12,10.2L9.6,10.2L9.6,9L12,9a1.2,1.2 0,0 1,1.2 1.2v1.2ZM19.3,11.1a0.9,0.9 0,0 1,-0.9 0.9,0.9 0.9,0 0,1 0.9,0.9v0.9A1.2,1.2 0,0 1,18.1 15L15.7,15L15.7,13.8h2.4L18.1,12.6L16.9,12.6L16.9,11.4h1.2L18.1,10.2L15.7,10.2L15.7,9h2.4a1.2,1.2 0,0 1,1.2 1.2v0.9Z" />
+</vector>
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index 34c0bdd..1570312 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -21,5 +21,5 @@
         android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,2.0c1.1,0.0 2.0,0.9 2.0,2.0s-0.9,2.0 -2.0,2.0 -2.0,-0.9 -2.0,-2.0 0.9,-2.0 2.0,-2.0zm9.0,7.0l-6.0,0.0l0.0,13.0l-2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0L9.0,22.0L9.0,9.0L3.0,9.0L3.0,7.0l18.0,0.0l0.0,2.0z"/>
+        android:pathData="M20.5 6c-2.61.7-5.67 1-8.5 1s-5.89-.3-8.5-1L3 8c1.86.5 4 .83 6 1v13h2v-6h2v6h2V9c2-.17 4.14-.5 6-1l-.5-2zM12 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"/>
 </vector>
diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml
index 7f161e2..178b131 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 9bf6a27..36dcc38 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 0000000..36dcc38
--- /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 0000000..7b86b89
--- /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 00bd736..5a8f0e9 100644
--- a/res/drawable/ic_suggested_notifications.xml
+++ b/res/drawable/ic_suggested_notifications.xml
@@ -14,12 +14,11 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/suw_color_accent_light">
+    android:width="24.0dp"
+    android:height="24.0dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0c0.0,1.0 0.89,2.0 2.0,2.0zm6.0,-6.0l0.0,-5.0c0.0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4.0c0.0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.0,0.67 -1.5,1.5l0.0,0.68C7.63,5.36 6.0,7.92 6.0,11.0l0.0,5.0l-2.0,2.0l0.0,1.0l16.0,0.0l0.0,-1.0l-2.0,-2.0z"/>
+        android:fillColor="@color/suw_color_accent_light"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4a2,2 0,0 0,2 2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2.15,2.15a0.5,0.5 0,0 0,0.35 0.85h15.6c0.45,0 0.67,-0.54 0.35,-0.85L18,16z"/>
 </vector>
diff --git a/res/drawable/ic_suggestion_fingerprint.xml b/res/drawable/ic_suggestion_fingerprint.xml
index feebd94..bf5ee2e 100644
--- a/res/drawable/ic_suggestion_fingerprint.xml
+++ b/res/drawable/ic_suggestion_fingerprint.xml
@@ -18,7 +18,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
         android:height="32dp"
-        android:tint="?android:attr/colorAccent"
+        android:tint="?android:attr/colorControlNormal"
         android:viewportWidth="32.0"
         android:viewportHeight="32.0">
     <path
diff --git a/res/drawable/ic_suggestion_gesture.xml b/res/drawable/ic_suggestion_gesture.xml
new file mode 100644
index 0000000..b90ad94
--- /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_theaters_vd_theme_24.xml b/res/drawable/ic_theaters_vd_theme_24.xml
deleted file mode 100644
index d0bad19..0000000
--- a/res/drawable/ic_theaters_vd_theme_24.xml
+++ /dev/null
@@ -1,25 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="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
diff --git a/res/drawable/ic_translate_24dp.xml b/res/drawable/ic_translate_24dp.xml
new file mode 100644
index 0000000..4df035c
--- /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/search_panel_list_background.xml b/res/drawable/selectable_card.xml
similarity index 70%
copy from res/drawable/search_panel_list_background.xml
copy to res/drawable/selectable_card.xml
index 7f7b560..9c19877 100644
--- a/res/drawable/search_panel_list_background.xml
+++ b/res/drawable/selectable_card.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,9 +15,8 @@
      limitations under the License.
 -->
 
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:inset="0dip">
-
-    <color android:color="?android:attr/colorBackground" />
-
-</inset>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:drawable="?android:attr/colorBackground"/>
+</ripple>
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 63b7e48..218192c 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 b321519..10fea84 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">
+            android:clipChildren="false"
+            android:paddingBottom="0dp">
 
-            <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" />
+            <!-- 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">
 
-            <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">
+                <ImageView
+                    android:id="@+id/suw_layout_icon"
+                    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" />
 
                 <TextView
-                    style="@style/SuwDescription.Glif"
-                    android:id="@+id/start_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_start_message"/>
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="0dp" />
+
+                <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" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <include layout="@layout/fingerprint_enroll_enrolling_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"/>
 
                 <TextView
-                    style="@style/SuwDescription.Glif"
-                    android:id="@+id/repeat_message"
-                    android:layout_width="match_parent"
+                    style="@style/TextAppearance.FingerprintErrorText"
+                    android:id="@+id/error_text"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_repeat_message"
+                    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"/>
 
-            </FrameLayout>
+            </LinearLayout>
 
         </LinearLayout>
-
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="match_parent">
-
-            <include layout="@layout/fingerprint_enroll_enrolling_content"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"/>
-
-            <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"/>
-
-        </FrameLayout>
-
-    </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 a43534f..7877d98 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -42,7 +42,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:orientation="vertical"
                 android:clipChildren="false"
                 android:clipToPadding="false">
@@ -52,6 +52,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" />
@@ -70,13 +71,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 ca1a2d2..0b673b8 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>
 
+            <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"
+                    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>
-
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-
-            <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" />
-
-        </FrameLayout>
-
-    </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 818d47c..0000000
--- a/res/layout/account_header.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/EntityHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:gravity="center_vertical"
-        android:paddingTop="24dip"
-        android:paddingBottom="24dip"
-        android:orientation="horizontal">
-
-        <LinearLayout
-          android:id="@+id/icon_container"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:minWidth="56dp"
-          android:orientation="horizontal"
-          android:paddingEnd="12dp"
-          android:paddingTop="12dp"
-          android:paddingBottom="12dp">
-                <ImageView
-                  android:id="@android:id/icon"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:maxWidth="48dp"
-                  android:maxHeight="48dp"/>
-        </LinearLayout>
-
-        <TextView
-          android:id="@android:id/title"
-          style="@style/TextAppearance.EntityHeaderTitle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:singleLine="true"/>
-
-</LinearLayout>
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
deleted file mode 100644
index 2db23e4..0000000
--- a/res/layout/app_details.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2016 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <!-- App snippet with buttons -->
-    <RelativeLayout
-        android:id="@+id/app_snippet"
-        style="@style/EntityHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="0dp"
-        android:paddingTop="24dp"
-        android:paddingBottom="24dp">
-        <ImageView
-            android:id="@+id/app_detail_icon"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:scaleType="fitXY"
-            android:layout_gravity="center_horizontal"
-            android:antialias="true"/>
-
-        <LinearLayout
-            android:id="@+id/app_detail_links"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/right_button"
-                style="?android:attr/actionOverflowButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_weight="1"
-                android:layout_height="0dp"
-                android:minWidth="@dimen/min_tap_target_size"
-                android:src="@drawable/ic_settings_24dp"
-                android:tint="?android:attr/colorAccent"/>
-
-            <ImageButton
-                android:id="@+id/left_button"
-                style="?android:attr/actionOverflowButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_weight="1"
-                android:layout_height="0dp"
-                android:minWidth="@dimen/min_tap_target_size"
-                android:src="@null"
-                android:tint="?android:attr/colorAccent"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/app_detail_icon"
-            android:layout_toStartOf="@id/app_detail_links"
-            android:paddingStart="24dp"
-            android:paddingEnd="24dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/app_detail_title"
-                style="@style/TextAppearance.EntityHeaderTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="false"
-                android:ellipsize="marquee"
-                android:gravity="start"
-                android:textDirection="locale"
-                android:paddingTop="8dp"/>
-
-            <TextView
-                android:id="@+id/install_type"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="start"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                android:textColor="?android:attr/textColorSecondary"/>
-
-            <TextView
-                android:id="@+id/app_detail_summary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="start"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textAppearance="@android:style/TextAppearance.Material.Body1"
-                android:textColor="?android:attr/textColorSecondary"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/app_domains_dialog.xml b/res/layout/app_domains_dialog.xml
index f9c6b64..d006027 100644
--- a/res/layout/app_domains_dialog.xml
+++ b/res/layout/app_domains_dialog.xml
@@ -15,18 +15,12 @@
      limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:paddingStart="24dp"
-             android:paddingTop="16dp"
-             android:paddingEnd="24dp">
+<ListView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:divider="@null"
+    android:scrollbarStyle="insideOverlay"
+    android:padding="24dp" />
 
-    <ListView
-            android:id="@android:id/list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:divider="@null"
-            android:scrollbarStyle="insideOverlay" />
-
-</FrameLayout>
diff --git a/res/layout/app_domains_item.xml b/res/layout/app_domains_item.xml
index e2ccbd3..5aa9cfa 100644
--- a/res/layout/app_domains_item.xml
+++ b/res/layout/app_domains_item.xml
@@ -15,12 +15,12 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/domain_name"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="4dp"
     android:paddingEnd="4dp"
-    android:paddingTop="16dp"
-    android:divider="@null"
-    />
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp" />
diff --git a/res/layout/app_item.xml b/res/layout/app_item.xml
index 15a9014..d53afc9 100644
--- a/res/layout/app_item.xml
+++ b/res/layout/app_item.xml
@@ -18,16 +18,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="72dp"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp"
     android:gravity="top"
     android:columnCount="3"
     android:duplicateParentState="true">
 
     <ImageView
         android:id="@android:id/icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_gravity="center"
         android:scaleType="fitXY"
         android:layout_marginEnd="16dip"
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index 97cc016..db90e2e 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="12dp"
+            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: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 b782e39..ea75865 100644
--- a/res/layout/battery_history_detail.xml
+++ b/res/layout/battery_history_detail.xml
@@ -49,7 +49,7 @@
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="?android:attr/textColorSecondary"/>
 
-            <com.android.settingslib.graph.UsageView
+            <com.android.settings.graph.UsageView
                 android:id="@+id/battery_usage"
                 android:layout_width="match_parent"
                 android:layout_height="141dp"
diff --git a/res/layout/battery_usage_graph.xml b/res/layout/battery_usage_graph.xml
index 80f966b..f46ac6a 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 0000000..46ad539
--- /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 0888b5e..7ce3034 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"/>
-
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:inputType="textPassword"
-            android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"
-            android:textSize="24sp"
-            style="@style/TextAppearance.PasswordEntry"/>
+            android:visibility="gone" />
 
         <LinearLayout
-                android:id="@+id/bottom_container"
+            android:id="@+id/password_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:layoutMode="opticalBounds"
+            android:paddingBottom="8dp">
+
+            <!-- Password entry field -->
+            <com.android.settings.widget.ScrollToParentEditText
+                android:id="@+id/password_entry"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:orientation="vertical">
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:inputType="textPassword"
+                android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"
+                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 57be320..323a884 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 a54987d..3ea960d 100644
--- a/res/layout/choose_lock_pattern_common.xml
+++ b/res/layout/choose_lock_pattern_common.xml
@@ -22,20 +22,42 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_lock"
+    android:layout="@layout/suw_glif_blank_template"
     settings:suwFooter="@layout/choose_lock_pattern_common_footer"
     settings:suwHeaderText="@string/lockpassword_choose_your_pattern_header">
 
     <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
         android:id="@+id/topLayout"
-        style="@style/SuwContentFrame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipChildren="false"
         android:clipToPadding="false"
         android:orientation="vertical">
 
+        <LinearLayout
+            style="@style/SuwGlifHeaderContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/suw_layout_icon"
+                style="@style/LockPatternIconStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_lock" />
+
+            <TextView
+                android:id="@+id/suw_layout_title"
+                style="@style/SuwGlifHeaderTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
         <!-- takes up all space above button bar at bottom -->
         <LinearLayout
+            style="@style/SuwContentFrame"
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
@@ -47,7 +69,6 @@
             <TextView android:id="@+id/headerText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:minLines="2"
                 android:gravity="center"
                 android:textSize="18sp" />
@@ -55,7 +76,7 @@
             <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
-                android:layout_weight="4" />
+                android:layout_weight="1" />
 
         </LinearLayout>
 
diff --git a/res/layout/condition_card.xml b/res/layout/condition_card.xml
deleted file mode 100644
index 4edd0f2..0000000
--- 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 f7ba859..4f93f54 100644
--- a/res/layout/account_type_preference.xml
+++ b/res/layout/condition_header_icon.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,8 +16,10 @@
 -->
 
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+    android:id="@android:id/icon"
+    android:layout_width="@dimen/dashboard_tile_image_size"
+    android:layout_height="@dimen/dashboard_tile_image_size"
+    android:layout_marginStart="0dp"
+    android:layout_marginEnd="24dp"
+    android:tint="?android:attr/colorAccent"
+    android:scaleType="centerInside"/>
diff --git a/res/layout/condition_tile.xml b/res/layout/condition_tile.xml
new file mode 100644
index 0000000..3e2f9b4
--- /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 6942863..05e90d2 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 0652e7e..558522c 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 e20d04d..758fc0d 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">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <ImageView
+                android:id="@+id/suw_layout_icon"
+                style="@style/LockPatternIconStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="?attr/suwGlifHeaderGravity"
+                android:src="@drawable/ic_lock" />
+
+            <TextView
+                android:id="@+id/headerText"
+                style="@style/SuwGlifHeaderTitle"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_height="wrap_content" />
 
-                <ImageView
-                    android:id="@+id/suw_layout_icon"
-                    style="@style/SuwGlifIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_lock" />
+            <TextView
+                style="@style/SuwDescription.Glif"
+                android:id="@+id/detailsText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="?attr/suwMarginSides"
+                android:layout_marginEnd="?attr/suwMarginSides" />
 
-                <TextView
-                    android:id="@+id/headerText"
-                    style="@style/SuwGlifHeaderTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <TextView
-                    style="@style/SuwDescription.Glif"
-                    android:id="@+id/detailsText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="?attr/suwMarginSides"
-                    android:layout_marginEnd="?attr/suwMarginSides" />
-
-            </LinearLayout>
-
-        </ScrollView>
+        </LinearLayout>
 
         <com.android.internal.widget.LockPatternView
             android:id="@+id/lockPattern"
-            android:layout_width="312dp"
-            android:layout_height="0dp"
-            android:layout_weight="3"
-            android:layout_gravity="center_horizontal"/>
-
-        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="vertical">
+            android:layout_weight="4"
+            android:layout_gravity="center_horizontal"/>
 
-            <TextView
-                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
-                android:accessibilityLiveRegion="polite"
-                android:id="@+id/errorText"
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="12dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:gravity="center_vertical"/>
+        <TextView
+            style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
+            android:accessibilityLiveRegion="polite"
+            android:id="@+id/errorText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:gravity="center_vertical"/>
 
-            <ImageView
-                android:id="@+id/fingerprintIcon"
-                android:layout_gravity="center_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_marginBottom="24dp"
-                android:contentDescription="@string/confirm_fingerprint_icon_content_description"
-                android:visibility="gone"/>
-        </LinearLayout>
+        <ImageView
+            android:id="@+id/fingerprintIcon"
+            android:layout_gravity="center_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="24dp"
+            android:contentDescription="@string/confirm_fingerprint_icon_content_description"
+            android:visibility="gone"/>
 
         <Button
             android:id="@+id/cancelButton"
diff --git a/res/layout/connection_detail_pref.xml b/res/layout/connection_detail_pref.xml
deleted file mode 100644
index 182f2cb..0000000
--- 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 4a9d7c0..d1e0cea 100644
--- a/res/layout/convert_fbe.xml
+++ b/res/layout/convert_fbe.xml
@@ -23,7 +23,7 @@
         <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
+                android:layout_marginStart="@dimen/preference_no_icon_padding_start"
                 android:layout_marginEnd="12dp"
                 android:layout_marginTop="12dp"
                 android:textSize="18sp"
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index 1ec1730..e35dbff 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -30,8 +30,8 @@
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
         android:scaleType="centerInside"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -53,7 +53,7 @@
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="1"
             android:ellipsize="end"
-            android:paddingEnd="@dimen/dashboard_tile_image_margin_start" />
+            android:paddingEnd="@dimen/dashboard_tile_image_margin" />
 
     </LinearLayout>
 
diff --git a/res/layout/data_usage_graph.xml b/res/layout/data_usage_graph.xml
index dc0559d..8f83d14 100644
--- a/res/layout/data_usage_graph.xml
+++ b/res/layout/data_usage_graph.xml
@@ -22,7 +22,7 @@
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:orientation="vertical">
 
-    <com.android.settingslib.graph.UsageView
+    <com.android.settings.graph.UsageView
         android:id="@+id/data_usage"
         android:layout_width="match_parent"
         android:layout_height="@dimen/data_usage_chart_height"
diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index c534bf1..22729b6 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 fd70ad5..0000000
--- a/res/layout/dream_info_row.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-     Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="horizontal"
-    android:background="?android:attr/selectableItemBackground" >
-
-    <!-- Dream icon -->
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="@android:dimen/app_icon_size"
-        android:layout_height="@android:dimen/app_icon_size"
-        android:layout_centerVertical="true"
-        android:layout_marginBottom="10dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginTop="10dp"
-        android:contentDescription="@null"
-        android:maxHeight="@android:dimen/app_icon_size"
-        android:maxWidth="@android:dimen/app_icon_size"
-        android:scaleType="fitCenter" />
-
-    <!-- Dream caption -->
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:layout_centerVertical="true"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:gravity="center_vertical"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textAlignment="viewStart"
-        android:labelFor="@android:id/button2" />
-
-    <!-- Dream radio button -->
-
-    <RadioButton
-        android:id="@android:id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:duplicateParentState="true"
-        android:clickable="false"
-        android:focusable="false" />
-
-    <!-- Divider -->
-
-    <ImageView
-        android:id="@+id/divider"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:contentDescription="@null"
-        android:src="@drawable/nav_divider" />
-
-    <!-- Settings icon -->
-
-    <ImageView
-        android:id="@android:id/button2"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_margin="0dip"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/screensaver_settings_button"
-        android:padding="8dip"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/ic_settings" />
-
-</LinearLayout>
diff --git a/res/layout/dream_start_button.xml b/res/layout/dream_start_button.xml
new file mode 100644
index 0000000..7d5e0c9
--- /dev/null
+++ b/res/layout/dream_start_button.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:gravity="bottom"
+    android:paddingTop="4dp"
+    android:paddingStart="72dp"
+    android:paddingEnd="72dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/dream_start_now_button"
+        style="@style/DreamStartButton"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/screensaver_settings_dream_start"
+        android:paddingEnd="8dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/expand_preference.xml b/res/layout/expand_preference.xml
index f17e67c..729dfd9 100644
--- a/res/layout/expand_preference.xml
+++ b/res/layout/expand_preference.xml
@@ -28,10 +28,10 @@
     android:clipToPadding="false">
 
     <LinearLayout
-        android:id="@+id/icon_container"
+        android:id="@+id/icon_frame"
+        style="@style/preference_icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minWidth="56dp"
         android:gravity="start|center_vertical"
         android:orientation="horizontal"
         android:paddingEnd="12dp"
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index 7f8eb1b..60ca601 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">
 
-        <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"/>
+            <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"/>
+
+        </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 0000000..b4ed37e
--- /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 fa344ab..ea518a7 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"/>
-
-            <View
-                android:layout_height="0dp"
-                android:layout_width="match_parent"
-                android:layout_weight="1"/>
-
-            <Button
-                style="@style/SuwGlifButton.Primary"
-                android:id="@+id/next_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_gravity="end"
-                android:text="@string/fingerprint_enroll_button_next" />
-
         </LinearLayout>
-    </FrameLayout>
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <include
+            layout="@layout/fingerprint_enroll_find_sensor_graphic"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"/>
+
+    </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 0000000..e93fae9
--- /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 6d9cf70..ba3d07f 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" />
+            android:layout_weight="1"
+            android:maxWidth="@dimen/fingerprint_finish_max_size"
+            android:maxHeight="@dimen/fingerprint_finish_max_size">
 
-        <View
-            android:layout_height="24dp"
-            android:layout_width="match_parent"
-            android:layout_weight="1"/>
+            <ImageView
+                android:id="@+id/fingerprint_in_app_indicator"
+                style="@style/SuwContentIllustration"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@android:string/fingerprint_icon_content_description"
+                android:src="@drawable/fp_app_indicator" />
 
-        <ImageView
-            android:id="@+id/fingerprint_in_app_indicator"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_weight="5"
-            android:minHeight="@dimen/fingerprint_in_app_indicator_min_size"
-            android:minWidth="@dimen/fingerprint_in_app_indicator_min_size"
-            android:maxHeight="@dimen/fingerprint_in_app_indicator_max_size"
-            android:maxWidth="@dimen/fingerprint_in_app_indicator_max_size"
-            android:layout_gravity="center_horizontal"
-            android:contentDescription="@android:string/fingerprint_icon_content_description"
-            android:src="@drawable/fp_app_indicator" />
-
-        <View
-            android:layout_height="24dp"
-            android:layout_width="match_parent"
-            android:layout_weight="1"/>
+        </com.android.setupwizardlib.view.FillContentLayout>
 
     </LinearLayout>
 
diff --git a/res/drawable/search_panel_list_background.xml b/res/layout/horizontal_divider.xml
similarity index 67%
copy from res/drawable/search_panel_list_background.xml
copy to res/layout/horizontal_divider.xml
index 7f7b560..e4a277d 100644
--- a/res/drawable/search_panel_list_background.xml
+++ b/res/layout/horizontal_divider.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
      limitations under the License.
 -->
 
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:inset="0dip">
-
-    <color android:color="?android:attr/colorBackground" />
-
-</inset>
+<View
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/divider"
+    android:layout_width="match_parent"
+    android:layout_height=".75dp"
+    android:background="?android:attr/dividerHorizontal" />
\ No newline at end of file
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index 662b7db..ec2aaea 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 df7f45c..8080f10 100644
--- a/res/layout/password_requirement_item.xml
+++ b/res/layout/password_requirement_item.xml
@@ -15,8 +15,8 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/description_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="4dp"
-        android:textSize="14sp"/>
\ No newline at end of file
+    android:id="@+id/description_text"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="?attr/suwGlifHeaderGravity"
+    android:textSize="14sp"/>
diff --git a/res/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
index 5a1043d..3334bbb 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 39b2f1c..0000000
--- a/res/layout/preference_footer.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2016 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
-    android:clipToPadding="false">
-
-    <LinearLayout
-        android:id="@+id/icon_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="56dp"
-        android:gravity="start|top"
-        android:orientation="horizontal"
-        android:paddingEnd="12dp"
-        android:paddingTop="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 f3abb9c..0000000
--- a/res/layout/preference_linearcolor.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-    <com.android.settings.applications.LinearColorBar
-        android:id="@+id/linear_color_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center_vertical"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:shadowRadius="4"
-        android:shadowColor="?android:attr/colorBackground"
-        android:shadowDx="2"
-        android:shadowDy="2">
-    </com.android.settings.applications.LinearColorBar>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/preference_material_settings.xml b/res/layout/preference_material_settings.xml
index 9682e32..e2ab3bb 100644
--- a/res/layout/preference_material_settings.xml
+++ b/res/layout/preference_material_settings.xml
@@ -28,10 +28,10 @@
     android:clipToPadding="false">
 
     <LinearLayout
-        android:id="@+id/icon_container"
+        android:id="@+id/icon_frame"
+        style="@style/preference_icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minWidth="56dp"
         android:gravity="start|center_vertical"
         android:orientation="horizontal"
         android:paddingEnd="12dp"
diff --git a/res/layout/preference_small_icon.xml b/res/layout/preference_small_icon.xml
new file mode 100644
index 0000000..e734b4b
--- /dev/null
+++ b/res/layout/preference_small_icon.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2017 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!-- Same as preference_material except that it uses a 24dp fixed size icon -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="?android:attr/listPreferredItemHeightSmall"
+              android:gravity="center_vertical"
+              android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+              android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+              android:background="?android:attr/selectableItemBackground"
+              android:clipToPadding="false"
+              android:focusable="true" >
+
+    <LinearLayout
+        android:id="@+id/icon_frame"
+        style="@style/preference_icon_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="start|center_vertical"
+        android:orientation="horizontal"
+        android:paddingEnd="12dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp">
+        <android.support.v7.internal.widget.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:maxWidth="24dp"
+            app:maxHeight="24dp" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <TextView android:id="@android:id/title"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:textAppearance="?android:attr/textAppearanceListItem"
+                  android:ellipsize="marquee" />
+
+        <TextView android:id="@android:id/summary"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_below="@android:id/title"
+                  android:layout_alignStart="@android:id/title"
+                  android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+                  android:textColor="?android:attr/textColorSecondary"
+                  android:maxLines="10" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@android:id/widget_frame"
+                  android:layout_width="wrap_content"
+                  android:layout_height="match_parent"
+                  android:gravity="end|center_vertical"
+                  android:paddingStart="16dp"
+                  android:orientation="vertical" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 3eb0c97..107a8ae 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -26,7 +26,7 @@
     android:orientation="horizontal">
 
     <LinearLayout
-        android:id="@+id/icon_container"
+        android:id="@+id/icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minWidth="44dp"
diff --git a/res/layout/preference_widget_seekbar_settings.xml b/res/layout/preference_widget_seekbar_settings.xml
index c25c598..fb1e9c8 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 2d7ed1d..fae5027 100644
--- a/res/layout/preference_widget_summary.xml
+++ b/res/layout/preference_widget_summary.xml
@@ -18,6 +18,8 @@
     android:id="@+id/widget_summary"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:drawablePadding="8dp"
+    android:gravity="center_vertical|end"
     android:textAlignment="viewEnd"
     android:textAppearance="?android:attr/textAppearanceSmall"
     android:textColor="?android:attr/textColorSecondary" />
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index e11e997..e7d08cc 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -206,6 +206,14 @@
                 android:layout_height="wrap_content"
                 android:text="@string/wfc_provisioned_switch_string"/>
 
+        <!-- EAB/Presence provisioned -->
+        <Switch android:id="@+id/eab_provisioned_switch"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/eab_provisioned_switch_string"/>
+
         <!-- SMSC -->
         <RelativeLayout android:layout_width="match_parent"
                         android:layout_height="wrap_content">
@@ -302,5 +310,21 @@
                       android:textSize="12sp" />
         </LinearLayout>
 
+        <!-- Carrier Provisioning -->
+        <LinearLayout style="@style/entry_layout">
+            <Button android:id="@+id/carrier_provisioning"
+                    android:layout_marginTop="8dip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/carrier_provisioning"
+                    android:textSize="14sp"/>
+            <Button android:id="@+id/trigger_carrier_provisioning"
+                    android:layout_marginTop="8dip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/trigger_carrier_provisioning"
+                    android:textSize="14sp"/>
+        </LinearLayout>
+
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index ecc122f..939ff92 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 7df0649..ef99bee 100644
--- a/res/layout/search_icon_view.xml
+++ b/res/layout/search_icon_view.xml
@@ -14,20 +14,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<LinearLayout
+
+<ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/icon_container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:minWidth="56dp"
-    android:gravity="center_horizontal|top"
-    android:orientation="horizontal"
-    android:paddingEnd="12dp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp">
-    <com.android.internal.widget.PreferenceImageView
-        android:id="@android:id/icon"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:scaleType="fitCenter"/>
-</LinearLayout>
\ No newline at end of file
+    android:id="@android:id/icon"
+    android:layout_width="@dimen/dashboard_tile_image_size"
+    android:layout_height="match_parent"
+    android:scaleType="centerInside"
+    android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+    android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
diff --git a/res/layout/search_inline_switch_item.xml b/res/layout/search_inline_switch_item.xml
index 526f9fd..8f050a3 100644
--- a/res/layout/search_inline_switch_item.xml
+++ b/res/layout/search_inline_switch_item.xml
@@ -21,7 +21,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="?android:attr/selectableItemBackground"
     android:clipToPadding="false">
diff --git a/res/layout/search_intent_item.xml b/res/layout/search_intent_item.xml
index 98e2a9b..6bc00ad 100644
--- a/res/layout/search_intent_item.xml
+++ b/res/layout/search_intent_item.xml
@@ -21,7 +21,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="?android:attr/selectableItemBackground"
     android:clipToPadding="false">
diff --git a/res/layout/search_main.xml b/res/layout/search_main.xml
index ab728cd..6de344d 100644
--- a/res/layout/search_main.xml
+++ b/res/layout/search_main.xml
@@ -18,7 +18,6 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/main_content"
-             android:layout_height="match_parent"
-             android:layout_width="match_parent"
-             android:background="@color/material_grey_300"/>
+    android:id="@+id/main_content"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"/>
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 9445e0c..48a1d4c 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">
+    <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>
+
+    <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_recent_searches"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:paddingStart="@dimen/dashboard_padding_start"
-                  android:paddingEnd="@dimen/dashboard_padding_end"
-                  android:paddingTop="@dimen/dashboard_padding_top"
-                  android:paddingBottom="@dimen/dashboard_padding_bottom"
-                  android:scrollbarStyle="outsideOverlay"
-                  android:headerDividersEnabled="false"
-                  android:elevation="@dimen/search_panel_elevation"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/layout_results"
-                  android:layout_width="match_parent"
-                  android:layout_height="fill_parent"
-                  android:layout_above="@id/feedback_popup"
-                  android:orientation="vertical">
-
-        <!-- Padding is included in the background -->
-        <android.support.v7.widget.RecyclerView android:id="@+id/list_results"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingStart="@dimen/dashboard_padding_start"
-                  android:paddingEnd="@dimen/dashboard_padding_end"
-                  android:paddingTop="@dimen/dashboard_padding_top"
-                  android:paddingBottom="@dimen/dashboard_padding_bottom"
-                  android:scrollbarStyle="outsideOverlay"
-                  android:scrollbars="vertical"/>
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/list_results"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/dashboard_padding_start"
+            android:paddingEnd="@dimen/dashboard_padding_end"
+            android:paddingTop="@dimen/dashboard_padding_top"
+            android:paddingBottom="@dimen/dashboard_padding_bottom"
+            android:scrollbarStyle="outsideOverlay"
+            android:scrollbars="vertical"/>
 
         <LinearLayout
             android:id="@+id/no_results_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="80dp"
+            android:paddingTop="96dp"
             android:orientation="vertical"
             android:visibility="gone">
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/actionBarSize"/>
+
             <ImageView
-            android:layout_height="160dp"
-            android:layout_width="160dp"
-            android:layout_gravity="center_horizontal"
-            android:src="@drawable/empty_search_results"/>
+                android:layout_height="160dp"
+                android:layout_width="160dp"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/empty_search_results"/>
 
             <TextView
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:paddingTop="24dp"
-            android:textSize="18sp"
-            android:text="@string/search_settings_no_results"
-            android:gravity="center"/>
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:paddingTop="24dp"
+                android:textSize="18sp"
+                android:text="@string/search_settings_no_results"
+                android:gravity="center"/>
+
         </LinearLayout>
-    </LinearLayout>
+
+    </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 0000000..9c4ca93
--- /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 c10193c..8e83cff 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 a5dee52..7d550b5 100644
--- a/res/layout/settings_summary_preference.xml
+++ b/res/layout/settings_summary_preference.xml
@@ -26,9 +26,10 @@
         android:id="@android:id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="0dp"
         android:layout_marginTop="0dp"
         android:layout_marginBottom="5dp"
+        android:fontFamily="@*android:string/config_headlineFontFamily"
+        android:paddingTop="0dp"
         android:textColor="?android:attr/colorAccent"
         android:textAppearance="@android:style/TextAppearance.Material.Display1"
         />
diff --git a/res/layout/storage_item.xml b/res/layout/storage_item.xml
index 0c1f60c..4b14bb3 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" />
+            <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" />
 
+            <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>
-
-    <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" />
-
 </LinearLayout>
diff --git a/res/layout/storage_summary.xml b/res/layout/storage_summary.xml
index 1beb49f..d48d62d 100644
--- a/res/layout/storage_summary.xml
+++ b/res/layout/storage_summary.xml
@@ -30,13 +30,14 @@
         android:id="@android:id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"
+        android:fontFamily="@*android:string/config_headlineFontFamily"
         android:singleLine="true"
         android:textAlignment="viewStart"
         android:textAppearance="@android:style/TextAppearance.Material.Subhead"
         android:textColor="?android:attr/colorAccent"
-        android:textSize="36sp"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal" />
+        android:textSize="36sp"/>
 
     <TextView
         android:id="@android:id/summary"
diff --git a/res/layout/storage_summary_donut.xml b/res/layout/storage_summary_donut.xml
index eb26077..8e11d71 100644
--- a/res/layout/storage_summary_donut.xml
+++ b/res/layout/storage_summary_donut.xml
@@ -36,10 +36,11 @@
 
         <TextView
             android:id="@android:id/title"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:fontFamily="@*android:string/config_headlineFontFamily"
             android:singleLine="true"
             android:textAlignment="viewStart"
             android:textAppearance="@android:style/TextAppearance.Material.Display1"
diff --git a/res/layout/storage_volume.xml b/res/layout/storage_volume.xml
index 570cec6..39a6f85 100644
--- a/res/layout/storage_volume.xml
+++ b/res/layout/storage_volume.xml
@@ -26,10 +26,9 @@
 
     <LinearLayout
         android:id="@+id/icon_frame"
+        style="@style/preference_icon_frame"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="-4dp"
-        android:minWidth="60dp"
         android:gravity="start|center_vertical"
         android:orientation="horizontal"
         android:paddingEnd="12dp"
diff --git a/res/layout/suggestion_condition_container.xml b/res/layout/suggestion_condition_container.xml
new file mode 100644
index 0000000..a4c60ad
--- /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 0000000..3eea6a5
--- /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 0000000..2551b65
--- /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 f3f39ff..0000000
--- 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 9e17e38..e2dd13a 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">
+    android:orientation="vertical">
 
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="@dimen/dashboard_tile_image_size"
-        android:layout_height="@dimen/dashboard_tile_image_size"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
-        android:scaleType="centerInside"/>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1">
+        android:background="@android:color/white"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:minHeight="@dimen/dashboard_tile_minimum_height">
 
-        <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"/>
+        <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"/>
 
-        <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"/>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-    </RelativeLayout>
+            <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/account_type_preference.xml b/res/layout/suggestion_tile_remote_container.xml
similarity index 61%
copy from res/layout/account_type_preference.xml
copy to res/layout/suggestion_tile_remote_container.xml
index f7ba859..fd19b80 100644
--- a/res/layout/account_type_preference.xml
+++ b/res/layout/suggestion_tile_remote_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,9 +14,11 @@
      limitations under the License.
 -->
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+<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 c2081c7..a42faf0 100644
--- a/res/layout/support_tile.xml
+++ b/res/layout/support_tile.xml
@@ -28,8 +28,8 @@
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
         android:scaleType="centerInside"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"/>
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin"/>
     <TextView
         android:id="@+id/tile_title"
         android:layout_width="wrap_content"
diff --git a/res/layout/usage_bottom_label.xml b/res/layout/usage_bottom_label.xml
new file mode 100644
index 0000000..6c16880
--- /dev/null
+++ b/res/layout/usage_bottom_label.xml
@@ -0,0 +1,20 @@
+<!--
+    Copyright (C) 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/usage_side_label.xml b/res/layout/usage_side_label.xml
new file mode 100644
index 0000000..6c16880
--- /dev/null
+++ b/res/layout/usage_side_label.xml
@@ -0,0 +1,20 @@
+<!--
+    Copyright (C) 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/usage_view.xml b/res/layout/usage_view.xml
new file mode 100644
index 0000000..8e9c580
--- /dev/null
+++ b/res/layout/usage_view.xml
@@ -0,0 +1,99 @@
+<!--
+    Copyright (C) 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/graph_label_group"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+
+        <LinearLayout
+            android:id="@+id/label_group"
+            android:layout_width="@dimen/usage_graph_labels_width"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <include android:id="@+id/label_top"
+                layout="@layout/usage_side_label" />
+
+            <Space
+                android:id="@+id/space1"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <include android:id="@+id/label_middle"
+                layout="@layout/usage_side_label" />
+
+            <Space
+                android:id="@+id/space2"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <include android:id="@+id/label_bottom"
+                layout="@layout/usage_side_label" />
+
+        </LinearLayout>
+
+        <com.android.settings.graph.UsageGraph
+            android:id="@+id/usage_graph"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:layout_marginTop="@dimen/usage_graph_margin_top_bottom"
+            android:layout_marginBottom="@dimen/usage_graph_margin_top_bottom" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/bottom_label_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Space
+            android:id="@+id/bottom_label_space"
+            android:layout_width="@dimen/usage_graph_labels_width"
+            android:layout_height="wrap_content"/>
+        <com.android.settings.graph.BottomLabelLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:layoutDirection="ltr">
+            <include android:id="@+id/label_start"
+                     layout="@layout/usage_side_label" />
+
+            <Space
+                android:id="@+id/spacer"
+                android:layout_width="40dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <include android:id="@+id/label_end"
+                     layout="@layout/usage_side_label" />
+        </com.android.settings.graph.BottomLabelLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index 47be368..71ce0ad 100644
--- a/res/layout/vpn_dialog.xml
+++ b/res/layout/vpn_dialog.xml
@@ -37,7 +37,8 @@
             <TextView style="@style/vpn_label"
                     android:text="@string/vpn_type"
                     android:labelFor="@+id/type"/>
-            <Spinner style="@style/vpn_value" android:id="@+id/type"
+            <Spinner style="@style/vpn_value"
+                     android:id="@+id/type"
                     android:prompt="@string/vpn_type"
                     android:entries="@array/vpn_types"/>
 
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index ba1f6fc..cfb6d9a 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -53,9 +53,21 @@
                         android:layout_height="wrap_content"
                         style="@style/wifi_item_edit_content"
                         android:hint="@string/wifi_ssid_hint"
-                        android:maxLength="32"
                         android:singleLine="true"
                         android:inputType="textNoSuggestions" />
+
+                <LinearLayout android:id="@+id/ssid_too_long_warning"
+                              android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              android:visibility="gone"
+                              style="@style/wifi_item" >
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_warning"
+                        android:text="@string/wifi_ssid_too_long" />
+                </LinearLayout>
+
              </LinearLayout>
 
             <LinearLayout
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 61a6476..d959cef 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Goed"</item>
     <item msgid="8986346415847956850">"Uitstekend"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Altyd"</item>
-    <item msgid="844721238536786870">"Slegs wanneer ingeprop"</item>
-    <item msgid="1986753720941888596">"Nooit"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Altyd"</item>
-    <item msgid="7433294150916905997">"Slegs wanneer ingeprop"</item>
-    <item msgid="1390404486722375028">"Nooit"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Afgelope 30 dae"</item>
     <item msgid="6600989128423965319">"Stel gebruiksiklus …"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index baf74ce..e69c54a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Weier"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Maak toe"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Skakel oor"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Nog net <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> stappe oor voordat jy \'n ontwikkelaar is.</item>
       <item quantity="one">Nog net <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> stap oor voordat jy \'n ontwikkelaar is.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Jy het nie toestemming om Bluetooth-instellings te verander nie."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jou toestelle"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Verander ontsluitpatroon"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Probeer weer. Poging <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> van <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Laaste poging"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"As jy met hierdie poging \'n verkeerde werkpatroon invoer, sal jou werkprofiel en geassosieerde data van hierdie toestel af verwyder word."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"As jy met hierdie poging \'n verkeerde werk-PIN invoer, sal jou werkprofiel en geassosieerde data van hierdie toestel af verwyder word."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"As jy met hierdie poging \'n verkeerde werkwagwoord invoer, sal jou werkprofiel en geassosieerde data van hierdie toestel af verwyder word."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Te veel verkeerde pogings. Jou werkprofiel en geassosieerde data sal van hierdie toestel af verwyder word."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Maak toe"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Probeer weer. Poging <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> van <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Jou data sal uitgevee word"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"As jy met jou volgende poging \'n verkeerde patroon invoer, sal hierdie toestel se data uitgevee word"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"As jy met jou volgende poging \'n verkeerde PIN invoer, sal hierdie toestel se data uitgevee word"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"As jy met jou volgende poging \'n verkeerde wagwoord invoer, sal hierdie toestel se data uitgevee word"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"As jy met jou volgende poging \'n verkeerde patroon invoer, sal hierdie gebruiker uitgevee word"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"As jy met jou volgende poging \'n verkeerde PIN invoer, sal hierdie gebruiker uitgevee word"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"As jy met jou volgende poging \'n verkeerde wagwoord invoer, sal hierdie gebruiker uitgevee word"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"As jy met jou volgende poging \'n verkeerde patroon invoer, sal jou werkprofiel en sy data uitgevee word"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"As jy met jou volgende poging \'n verkeerde PIN invoer, sal jou werkprofiel en sy data uitgevee word"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"As jy met jou volgende poging \'n verkeerde wagwoord invoer, sal jou werkprofiel en sy data uitgevee word"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Te veel verkeerde pogings. Hierdie toestel se data sal uitgevee word."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Te veel verkeerde pogings. Hierdie gebruiker sal uitgevee word."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Te veel verkeerde pogings. Hierdie werkprofiel en sy data sal uitgevee word."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Maak toe"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Moet minstens <xliff:g id="COUNT">%d</xliff:g> karakters lank wees"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Die PIN moet minstens <xliff:g id="COUNT">%d</xliff:g> syfers lank wees"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Gaan voort"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die draadlose roeteerder se sekuriteitsinstelling (TKIP) word nie ondersteun nie"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Stawingmislukking. Probeer asseblief weer."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Nog \'n WPS-sessie is opgespoor. Probeer asseblief oor \'n paar minute weer."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi is ontkoppel. WPS-opstelling is gekanselleer."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Netwerknaam"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Voer die SSID in"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sekuriteit"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Begintyd"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Eindtyd"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Aan / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Maak skerm wakker wanneer jy kennisgewings ontvang"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Altyd aan"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Wys tyd, kennisgewingikone en ander inligting"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettertipegrootte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Maak teks groter of kleiner"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaart se sluitinstellings"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Vee SD-kaart uit"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Vee alle data op die interne USB-berging uit, soos musiek of foto\'s."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Vee al die data op die SD-kaart uit, soos musiek of foto\'s."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Vee e-SIM\'s uit"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Vee alle e-SIM\'s op die foon uit. Dit sal nie jou mobielediensplan kanselleer nie."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Vee alle e-SIM\'s op die tablet uit. Dit sal nie jou mobielediensplan kanselleer nie."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Stel tablet terug"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Stel foon terug"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vee al jou persoonlike inligting en afgelaaide programme uit? Jy kan nie hierdie handeling ontdoen nie!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Loop tans"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-berging"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
+    <string name="disabled" msgid="9206776641295849915">"Gedeaktiveer"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nie vir hierdie gebruiker geïnstalleer nie"</string>
     <string name="installed" msgid="3070865169422600098">"Geïnstalleer"</string>
     <string name="no_applications" msgid="7336588977497084921">"Geen programme nie"</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"Tale en invoer"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Tale en invoer"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Invoerbystand"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Skerm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flitslig"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Verstekprogramme"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Tale, tyd, rugsteun, opdaterings"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Instellings"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Deursoek instellings"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Deursoek instellings"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Soekinstellings"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Soekinstellings"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, netwerkverbinding"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"sms, teksboodskappe, boodskappe, boodskappe"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"sellulêr, mobiel, selfoondiensverskaffer, draadloos, data, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gebaar"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betaal, tik, betalings"</string>
     <string name="keywords_backup" msgid="470070289135403022">"rugsteun, rugsteun"</string>
+    <!-- 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">"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>
@@ -2727,7 +2896,7 @@
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Luivolume"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Kennisgewingvolume"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Foonluitoon"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"Verstekkennisgewingklank"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Verstekkennisgewing-klank"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Klank deur program verskaf"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"Verstekkennisgewingklank"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Verstekwekkerklank"</string>
@@ -2743,7 +2912,7 @@
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Alle oudio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Net media-oudio"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"Stil"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Klank"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alarmsein"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreer"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Aanskakel-klanke"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Geen outomatiese reëls is aangeskakel nie"</string>
@@ -2752,7 +2921,7 @@
       <item quantity="one">1 outomatiese reël is aangeskakel</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Moenie Steur Nie-voorkeure"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Net Prioriteit-toelatings"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"\'Net prioriteit\'-toelatings"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Outomatiese reëls"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Stel Moenie Steur Nie-reëls"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Beperk klanke en vibrasies op sekere tye"</string>
@@ -2833,8 +3002,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>
@@ -2862,7 +3029,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"Laat kennisgewingkol toe"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Wys kennisgewingkol"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoreer Moenie Steur Nie"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Laat hierdie kennisgewings steeds onderbreek wanneer Moenie Steur Nie na Net Prioriteit gestel is"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Laat hierdie kennisgewings steeds onderbreek wanneer Moenie Steur Nie na \'Net prioriteit\' gestel is"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op die sluitskerm"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Geblokkeer"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteit"</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -3091,15 +3253,21 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"Gemiddeld <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">"Batteryoptimering"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"Batteryoptimalisering"</string>
     <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="high_power_filter_on" msgid="3222265297576680099">"Nie geoptimeer nie"</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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
+    <string name="high_power_filter_on" msgid="3222265297576680099">"Nie geoptimaliseer nie"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nie geoptimeer nie"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimaliseer batterygebruik"</string>
-    <string name="high_power_system" msgid="7362862974428225301">"Batteryoptimering is nie beskikbaar nie"</string>
-    <string name="high_power_desc" msgid="6283926163708585760">"Moenie batteryoptimering toepas nie. Dit kan jou battery dalk vinniger pap maak."</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Batteryoptimalisering is nie beskikbaar nie"</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"Moenie batteryoptimalisering toepas nie. Dit kan jou battery dalk vinniger pap maak."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Laat program altyd in die agtergrond loop?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"As jy <xliff:g id="APP_NAME">%1$s</xliff:g> toelaat om altyd in die agtergrond te loop, kan dit batterylewe verlaag. \n\nJy kan dit later vanuit Instellings &gt; Programme en kennisgewings verander."</string>
     <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> gebruik sedert battery laas volgelaai is"</string>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Installeer onbekende apps"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Programtoestemming om stelselinstellings te verander"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Mag stelselinstellings verander"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Hierdie toestemming laat \'n program toe om stelselinstellings te verander."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Laat van hierdie bron af toe"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dubbeldraai vir kamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Maak die kameraprogram oop deur jou pols twee keer vinnig te draai"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Outomaties"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handmatig"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Maak nou spasie beskikbaar"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gebare"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gebaarkortpaaie"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Vinnige gebare om jou foon te beheer"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Vinnige gebare om jou tablet te beheer"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Vinnige gebare om jou toestel te beheer"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Spring na kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Druk die aan/af-skakelaar twee keer om die kamera vinnig oop te maak. Dit werk op enige skerm."</string>
+    <!-- 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">"Draai kamera"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Lig op om kamera oop te maak"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Lig jou foon op na \'n fotoneemposisie (landskap of portret) om die kamera outomaties oop te maak. Dit werk wanneer jou foon slaap of gesluit is."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Neem foto\'s wanneer die foon slaap of gesluit is"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Bystandgebaar"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitiwiteit"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-am/arrays.xml b/res/values-am/arrays.xml
index 2e991b8..b20d791 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ጥሩ"</item>
     <item msgid="8986346415847956850">"እጅግ በጣም ጥሩ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ሁልጊዜ"</item>
-    <item msgid="844721238536786870">"ሲሰካ ብቻ"</item>
-    <item msgid="1986753720941888596">"በፍፁም"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ሁልጊዜ"</item>
-    <item msgid="7433294150916905997">"ሲሰካ ብቻ"</item>
-    <item msgid="1390404486722375028">"ፈፅሞ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"የመጨረሻዎቹ 30 ቀኖች"</item>
     <item msgid="6600989128423965319">"የአጠቃቀም ዑደት አዘጋጅ..."</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3cb9341..766ea50 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -23,13 +23,13 @@
     <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="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="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 +41,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 +107,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&amp;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">"የብሉቱዝ ቅንብሮችን ለመለወጥ ፈቃድ የልዎትም።"</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> የብሉቱዝ ቅንብሮች ክፍት ሆኖ ሳለ አቅራቢያ ላሉ መሣሪያዎች ይታያል።"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- 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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
+    <!-- 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>
@@ -449,6 +487,9 @@
     <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>
+    <!-- no translation found for setup_lock_settings_options_dialog_title (5058207955455973917) -->
+    <skip />
     <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 +560,36 @@
     <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>
+    <!-- no translation found for lock_failed_attempts_before_wipe (2219711062197089783) -->
+    <skip />
+    <!-- no translation found for lock_last_attempt_before_wipe_warning_title (4277765862798876826) -->
+    <skip />
+    <!-- no translation found for lock_last_pattern_attempt_before_wipe_device (4999108263936246210) -->
+    <skip />
+    <!-- no translation found for lock_last_pin_attempt_before_wipe_device (2191214314973933300) -->
+    <skip />
+    <!-- no translation found for lock_last_password_attempt_before_wipe_device (6526655065466746563) -->
+    <skip />
+    <!-- no translation found for lock_last_pattern_attempt_before_wipe_user (7851504071368235547) -->
+    <skip />
+    <!-- no translation found for lock_last_pin_attempt_before_wipe_user (4049024921333961715) -->
+    <skip />
+    <!-- no translation found for lock_last_password_attempt_before_wipe_user (4660886542496781672) -->
+    <skip />
+    <!-- no translation found for lock_last_pattern_attempt_before_wipe_profile (2437716252059050291) -->
+    <skip />
+    <!-- no translation found for lock_last_pin_attempt_before_wipe_profile (5799931839127476913) -->
+    <skip />
+    <!-- no translation found for lock_last_password_attempt_before_wipe_profile (6786586046975042158) -->
+    <skip />
+    <!-- no translation found for lock_failed_attempts_now_wiping_device (1951676829299522277) -->
+    <skip />
+    <!-- no translation found for lock_failed_attempts_now_wiping_user (6188180643494518001) -->
+    <skip />
+    <!-- no translation found for lock_failed_attempts_now_wiping_profile (1745475043685915442) -->
+    <skip />
+    <!-- no translation found for lock_failed_attempts_now_wiping_dialog_dismiss (8246716090548717312) -->
+    <skip />
     <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 +690,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +827,6 @@
     <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_ssid" msgid="5519636102673067319">"አውታረ መረብ ስም"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID ያስገቡ"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ደህንነት"</string>
@@ -810,7 +889,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 +925,28 @@
     <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>
+    <!-- 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_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">"የመገናኛ ነጥብን በማብራት ላይ…"</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 +993,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>
@@ -980,23 +1078,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1128,19 @@
     <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>
+    <!-- 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>
@@ -1273,6 +1392,8 @@
     <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>
+    <!-- no translation found for error_adding_apn_type (4181334016628549645) -->
+    <skip />
     <string name="restore_default_apn" msgid="8178010218751639581">"ነባሪ የAPN ቅንብሮችን እነበረበት ይመልሱ"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ወደ ነባሪ ዳግም አስጀምር"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"የዳግም አስጀምር ነባሪ APN ቅንብሮች ተጠናቀዋል"</string>
@@ -1302,6 +1423,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"የSD ካርድ አጥፋ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በውስጥ USB ማከማቻ አጥፋ።"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በSD ካርድ ላይ አጥፋ።"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM ደምስስ"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"በስልኩ ላይ ያሉ ሁሉንም eSIMዎች ይደምስሱ። ይሄ የእርስዎን የተንቀሳቃሽ ስልክ አገልግሎት ዕቅድ አይሰርዘውም።"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"በጡባዊው ላይ ያሉ ሁሉንም eSIMዎች ይደምስሱ። ይሄ የእርስዎን የተንቀሳቃሽ ስልክ አገልግሎት ዕቅድ አይሰርዘውም።"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ጡባዊ ዳግም አስጀምር"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ስልክ ድጋሚ አስጀምር"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"ሁሉም የእርስዎ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዙ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
@@ -1324,26 +1448,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1494,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>
@@ -1491,6 +1609,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1674,7 @@
     <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="default" msgid="1477351142334784771">"በSD ካርድ ላይ"</string>
+    <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>
@@ -1659,6 +1784,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"የግቤት እርዳታ"</string>
@@ -1873,6 +2003,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 +2073,46 @@
     <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>
@@ -1953,7 +2127,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">"CPU ጠቅላላ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ቅድመ ገፅ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ነቃ ብሏል"</string>
@@ -2005,6 +2180,8 @@
     <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>
+    <!-- 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="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>
@@ -2654,9 +2831,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>
@@ -2709,6 +2889,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>
@@ -2778,7 +2964,8 @@
     <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>
+    <!-- no translation found for notification_badging_title (5938709971403474078) -->
+    <skip />
     <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>
@@ -2833,8 +3020,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>
@@ -2859,8 +3044,10 @@
     <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>
+    <!-- no translation found for notification_badge_title (6370122441168519809) -->
+    <skip />
+    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+    <skip />
     <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>
@@ -2965,11 +3152,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 +3159,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 +3277,12 @@
     <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>
+    <!-- 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>
@@ -3187,8 +3375,9 @@
     <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="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>
@@ -3200,8 +3389,6 @@
     <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_switch_title" msgid="3621381992793251070">"ከዚህ ምንጭ ፍቀድ"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"ለካሜራ ሁለት ጊዜ ይጠምዝዙት"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"የእጅ አንጓዎን ሁለት ጊዜ በመጠምዘዝ የካሜራ መተግበሪያውን ይክፈቱ"</string>
@@ -3296,8 +3483,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 +3503,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>
@@ -3382,7 +3568,6 @@
     <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="developer_smallest_width" msgid="7516950434587313360">"አነስተኛ ስፋት"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ምንም የተጫኑ መተግበሪያዎች የፕሪሚየም ኤስኤምኤስ መዳረሻ አልጠየቁም"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ፕሪሚየም ኤስኤምኤስ ውድ ገንዘብ ሊያስወጣዎት ይችላል፣ እና በአገልግሎት አቅራቢ ክፍያዎ ላይ ሒሳብ ያስጨምርብዎታል። ለመተግበሪያ ፈቃድን ካነቁ ያንን መተግበሪያ በመጠቀም ፕሪሚየም ኤስኤምኤስ መላክ ይችላሉ።"</string>
@@ -3447,28 +3632,56 @@
     <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>
+    <!-- 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>
+    <!-- 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 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>
+    <!-- no translation found for camera_lift_trigger_suggestion_summary (7209899898244722404) -->
+    <skip />
     <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>
@@ -3572,6 +3785,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 +3799,10 @@
     <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>
+    <!-- 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-ar/arrays.xml b/res/values-ar/arrays.xml
index e98eee2..a2a7794 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"جيدة"</item>
     <item msgid="8986346415847956850">"ممتازة"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"دومًا"</item>
-    <item msgid="844721238536786870">"عند التوصيل فقط"</item>
-    <item msgid="1986753720941888596">"مطلقًا"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"دومًا"</item>
-    <item msgid="7433294150916905997">"عند التوصيل فقط"</item>
-    <item msgid="1390404486722375028">"مطلقًا"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"آخر ۳۰ يومًا"</item>
     <item msgid="6600989128423965319">"تعيين دورة الاستخدام..."</item>
@@ -294,7 +284,7 @@
     <item msgid="3073734345226842233">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
     <item msgid="2111767435887685265">"عرض الإعلام المنبثق"</item>
     <item msgid="1091168669714823370">"وسائط المشروع"</item>
-    <item msgid="485564189219029300">"تنشيط الشبكة الافتراضية الخاصة"</item>
+    <item msgid="485564189219029300">"تنشيط الشبكة الظاهرية الخاصة"</item>
     <item msgid="7155384795265164395">"كتابة الخلفية"</item>
     <item msgid="1835836196806147034">"تركيبة مساعدة"</item>
     <item msgid="5989890403088155055">"لقطة شاشة مساعدة"</item>
@@ -361,7 +351,7 @@
     <item msgid="1312534577834048535">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
     <item msgid="427580389823724225">"عرض الإعلام المنبثق"</item>
     <item msgid="4992007785575926253">"وسائط المشروع"</item>
-    <item msgid="2482631530338029480">"تنشيط الشبكة الافتراضية الخاصة"</item>
+    <item msgid="2482631530338029480">"تنشيط الشبكة الظاهرية الخاصة"</item>
     <item msgid="1662979573471871926">"كتابة الخلفية"</item>
     <item msgid="5964768335278263478">"تركيبة مساعدة"</item>
     <item msgid="2657138701132782702">"لقطة شاشة مساعدة"</item>
@@ -426,12 +416,12 @@
     <item msgid="7169235156349580064">"مخصص"</item>
   </string-array>
   <string-array name="vpn_types_long">
-    <item msgid="2732002039459078847">"‏شبكة افتراضية خاصة (VPN) عبر PPTP"</item>
-    <item msgid="3799752201662127867">"‏شبكة افتراضية خاصة (VPN) لـ L2TP/IPSec مزودة بمفاتيح مشتركة مسبقًا"</item>
-    <item msgid="4725504331295252103">"‏شبكة افتراضية خاصة (VPN) لـ L2TP/IPSec مزودة بشهادات"</item>
-    <item msgid="7526551163264034377">"‏شبكة افتراضية خاصة (VPN) لـ IPSec مزودة بمفاتيح مشتركة مسبقًا ومصادقة Xauth"</item>
-    <item msgid="8064740940687465039">"‏شبكة افتراضية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة Xauth"</item>
-    <item msgid="4946199982372391490">"‏شبكة افتراضية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة مختلطة"</item>
+    <item msgid="2732002039459078847">"‏شبكة ظاهرية خاصة (VPN) عبر PPTP"</item>
+    <item msgid="3799752201662127867">"‏شبكة ظاهرية خاصة (VPN) لـ L2TP/IPSec مزودة بمفاتيح مشتركة مسبقًا"</item>
+    <item msgid="4725504331295252103">"‏شبكة ظاهرية خاصة (VPN) لـ L2TP/IPSec مزودة بشهادات"</item>
+    <item msgid="7526551163264034377">"‏شبكة ظاهرية خاصة (VPN) لـ IPSec مزودة بمفاتيح مشتركة مسبقًا ومصادقة Xauth"</item>
+    <item msgid="8064740940687465039">"‏شبكة ظاهرية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة Xauth"</item>
+    <item msgid="4946199982372391490">"‏شبكة ظاهرية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة مختلطة"</item>
   </string-array>
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"غير متصل"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4c6c261..fea2e34 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/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="zero">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج أية خطوة (<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>).</item>
       <item quantity="two">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى خطوتين (<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>).</item>
@@ -34,6 +33,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 +45,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 +111,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">"ليست لديك أذونات لتغيير إعدادات بلوتوث."</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> مرئي للأجهزة القريبة أثناء فتح إعدادات البلوتوث."</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>
@@ -125,7 +142,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +179,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) -->
@@ -282,7 +305,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 والبلوتوث ووضع الطائرة وشبكات الجوّال والشبكات الافتراضية الخاصة (VPN)"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"‏إدارة Wi-Fi والبلوتوث ووضع الطائرة وشبكات الجوّال والشبكات الظاهرية الخاصة (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>
@@ -337,7 +360,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,43 +389,58 @@
     <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>
+    <!-- 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="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fingerprint enrollment didn\'t work. Try again or use a different finger."</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>
@@ -461,6 +499,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"يمكنك منع الآخرين من استخدام هذا الجهاز بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"يمكنك منع الآخرين من استخدام هذا الهاتف بدون إذنك من خلال تنشيط ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"اختيار الطريقة الاحتياطية لقفل الشاشة"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"خيارات قفل الشاشة"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"خيارات قفل الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"تأمين الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / بعد النوم مباشرة"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> بعد النوم"</string>
@@ -531,13 +571,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغيير نقش إلغاء التأمين"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏تغيير رمز PIN لإلغاء التأمين"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"أعد المحاولة. المحاولة <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> من <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"المحاولة الأخيرة"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"عند إدخال نمط للعمل غير صحيح في هذه المحاولة، ستتم إزالة الملف الشخصي للعمل والبيانات المرتبطة به من هذا الجهاز."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"عند إدخال رقم تعريف شخصي للعمل غير صحيح في هذه المحاولة، ستتم إزالة الملف الشخصي للعمل والبيانات المرتبطة به من هذا الجهاز."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"عند إدخال كلمة مرور للعمل غير صحيحة في هذه المحاولة، ستتم إزالة الملف الشخصي للعمل والبيانات المرتبطة به من هذا الجهاز."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"هناك عدد كبير جدًا من المحاولات غير الصحيحة. ستتم إزالة الملف الشخصي للعمل والبيانات المرتبطة به من هذا الجهاز."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"رفض"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"أعد المحاولة. المحاولة <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> من <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"سيتم حذف بياناتك"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"عند إدخال نقش غير صحيح في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"عند إدخال رقم تعريف شخصي غير صحيح في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"عند إدخال كلمة مرور غير صحيحة في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"عند إدخال نقش غير صحيح في المحاولة التالية، سيتم حذف هذا المستخدم"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"عند إدخال رقم تعريف شخصي غير صحيح في المحاولة التالية، سيتم حذف هذا المستخدم"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"عند إدخال كلمة مرور غير صحيحة في المحاولة التالية، سيتم حذف هذا المستخدم"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"عند إدخال نقش غير صحيح في المحاولة التالية، سيتم حذف ملفك الشخصي للعمل وبياناته"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"عند إدخال رقم تعريف شخصي غير صحيح في المحاولة التالية، سيتم حذف ملفك الشخصي للعمل وبياناته"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"عند إدخال كلمة مرور غير صحيحة في المحاولة التالية، سيتم حذف ملفك الشخصي للعمل وبياناته"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"لقد استنفدت عدد المحاولات غير الصحيحة وسيتم حذف بيانات هذا الجهاز."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"لقد استنفدت عدد المحاولات غير الصحيحة وسيتم حذف هذا المستخدم."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"لقد استنفدت عدد المحاولات غير الصحيحة وسيتم حذف الملف الشخصي للعمل وبياناته."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"تجاهل"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"يجب أن تحتوي كلمة المرور على <xliff:g id="COUNT">%d</xliff:g> من الأحرف على الأقل"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"يجب أن يحتوي رقم التعريف الشخصي على <xliff:g id="COUNT">%d</xliff:g> من الأرقام على الأقل"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
@@ -670,6 +718,22 @@
     <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>
+    <!-- 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>
@@ -764,7 +828,7 @@
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"‏إدخال رقم تعريف شخصي في WPS"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"‏اتصال Wi-Fi مباشر"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"فحص"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"إعدادات متقدمة"</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>
@@ -791,7 +855,6 @@
     <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_ssid" msgid="5519636102673067319">"اسم الشبكة"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"‏أدخل SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"الأمان"</string>
@@ -817,7 +880,7 @@
     <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_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>
@@ -858,7 +921,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 +957,28 @@
     <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>
+    <!-- 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_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">"جارٍ تشغيل نقطة الاتصال…"</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 +1025,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>
@@ -952,12 +1034,12 @@
     <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="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>
@@ -969,7 +1051,7 @@
     <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_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>
@@ -1008,8 +1090,8 @@
     <string name="brightness" msgid="8480105032417444275">"مستوى السطوع"</string>
     <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_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>
@@ -1019,32 +1101,42 @@
     <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_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="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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1068,8 +1160,19 @@
     <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>
+    <!-- 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>
@@ -1325,6 +1428,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>
@@ -1358,6 +1462,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏محو جميع البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى أو الصور"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏محو جميع البيانات على بطاقة SD، مثل الموسيقى أو الصور"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"‏محو بيانات شرائح eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‏يمكنك محو بيانات كل شرائح eSIM على الهاتف. ولن يؤدي ذلك إلى إلغاء خطة خدمة الجوال."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‏يمكنك محو بيانات كل شرائح eSIM على الجهاز اللوحي. ولن يؤدي ذلك إلى إلغاء خطة خدمة الجوال."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"إعادة ضبط الجهاز اللوحي"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"إعادة تعيين الهاتف"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"هل تريد محو كل معلوماتك الشخصية وتطبيقاتك التي تم تنزيلها؟ لا يمكنك التراجع عن هذا الإجراء!"</string>
@@ -1380,26 +1487,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1414,8 +1515,8 @@
     <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_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_insert_sim_card" msgid="9052590985784056395">"‏الرجاء إدخال شريحة SIM وإعادة التشغيل"</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_mode_title" msgid="3982009713118421689">"الوضع"</string>
@@ -1432,7 +1533,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>
@@ -1463,7 +1564,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">"‏ترخيص WebView للنظام"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"الخلفيات"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"‏الشركات الموفرة لصور القمر الصناعي:\n‎©2014 CNES / Astrium، وDigitalGlobe وBluesky"</string>
@@ -1547,13 +1648,19 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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="storage_label" msgid="8700867073480107253">"التخزين"</string>
-    <string name="auto_launch_label" msgid="2669236885531442195">"الفتح تلقائيًا"</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>
@@ -1586,8 +1693,8 @@
     <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="auto_launch_disable_text" msgid="7800385822185540166">"لم يتم تعيين إعدادات افتراضية."</string>
+    <string name="clear_activities" msgid="7408923511535174430">"محو الإعدادات الافتراضية"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ربما لم يتم تصميم هذا التطبيق ليلائم شاشتك، يمكنك التحكم في كيفية ضبطه ليلائم شاشتك هنا."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"السؤال عند الإطلاق"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"تغيير حجم التطبيق"</string>
@@ -1610,6 +1717,7 @@
     <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="default" msgid="1477351142334784771">"‏في بطاقة SD"</string>
+    <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>
@@ -1719,6 +1827,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"المساعدة في الإدخال"</string>
@@ -1738,16 +1851,16 @@
     <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="virtual_keyboard_category" msgid="1012830752318677119">"لوحة المفاتيح الافتراضية"</string>
-    <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"لوحة المفاتيح الافتراضية المتاحة"</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>
     <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="default_keyboard_layout" msgid="4172606673510531271">"تلقائي"</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>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"استخدام الاهتزاز"</string>
@@ -1755,7 +1868,7 @@
     <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">"‏للتبديل، اضغط على ctrl-مسافة"</string>
-    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"تلقائي"</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>
@@ -1826,7 +1939,7 @@
     <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>
+    <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>
@@ -1905,7 +2018,7 @@
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"خيارات قياسية"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"اللغة"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"حجم النص"</string>
-    <string name="captioning_preset" msgid="8939737196538429044">"شكل الترجمة والشرح"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"نمط التسمية التوضيحية"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"خيارات مخصصة"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"لون الخلفية"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"تعتيم الخلفية"</string>
@@ -1916,9 +2029,9 @@
     <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_preview_text" msgid="4067935959797375065">"ستبدو الترجمة والشرح بالشكل التالي"</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>
+    <string name="locale_default" msgid="2593883646136326969">"افتراضي"</string>
     <string name="color_title" msgid="4258931051732243983">"اللون"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"الافتراضية"</string>
     <string name="color_none" msgid="3475640044925814795">"بدون"</string>
@@ -1957,6 +2070,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>
@@ -2004,7 +2125,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>
@@ -2023,6 +2144,46 @@
     <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>
@@ -2037,7 +2198,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">"‏إجمالي استخدام CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU في المقدمة"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ابق متيقظًا"</string>
@@ -2089,6 +2251,8 @@
     <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>
+    <!-- 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>
@@ -2149,7 +2313,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>
@@ -2213,7 +2377,7 @@
     <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_for_vpn_and_apps" msgid="4168197158768443365">"‏تم التثبيت للاستخدام بواسطة الشبكة الافتراضية الخاصة (VPN) والتطبيقات"</string>
+    <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"‏تم التثبيت للاستخدام بواسطة الشبكة الظاهرية الخاصة (VPN) والتطبيقات"</string>
     <string name="credential_for_wifi" msgid="6228425986551591864">"‏تم التثبيت للاستخدام بواسطة Wi-Fi"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"اكتب كلمة المرور لوحدة تخزين بيانات الاعتماد."</string>
@@ -2469,48 +2633,48 @@
     <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">"‏يجب تحديد خادم نظام أسماء نطاقات (DNS) للشبكة الافتراضية الخاصة (VPN) التي يتم تشغيلها دائمًا"</string>
-    <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"‏يجب أن تكون عناوين خادم نظام أسماء النطاقات (DNS) رقمية للشبكة الافتراضية الخاصة التي يتم تشغيلها دائمًا"</string>
-    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"‏المعلومات التي تم إدخالها لا تتوافق مع الشبكة الافتراضية الخاصة (VPN) التي يتم تشغيلها دائمًا"</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">"‏يجب تحديد خادم نظام أسماء نطاقات (DNS) للشبكة الظاهرية الخاصة (VPN) التي يتم تشغيلها دائمًا"</string>
+    <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"‏يجب أن تكون عناوين خادم نظام أسماء النطاقات (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>
     <string name="vpn_connect" msgid="8469608541746132301">"اتصال"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"استبدال"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"تعديل ملف شخصي لشبكة افتراضية خاصة"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"تعديل ملف شخصي لشبكة ظاهرية خاصة"</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_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">"نسيان الشبكة الافتراضية الخاصة"</string>
-    <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"هل تريد استبدال الشبكة الافتراضية الخاصة الحالية؟"</string>
-    <string name="vpn_set_vpn_title" msgid="4009987321156037267">"هل تريد تشغيل الشبكة الافتراضية الخاصة باستمرار؟"</string>
-    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"‏عند تشغيل هذا الإعداد، لن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة (VPN)"</string>
-    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"‏سيتم استبدال شبكتك الافتراضية الخاصة (VPN) الحالية ولن تتمكن من استخدام اتصال الإنترنت إلا بعد أن ينجح اتصال الشبكة الافتراضية الخاصة"</string>
-    <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"‏أنت متصل حاليًا بشبكة افتراضية خاصة (VPN) مضبوطة على وضع التشغيل الدائم. وإذا اتصلت بشبكة افتراضية خاصة أخرى، فسيتم استبدال شبكتك الافتراضية الخاصة الحالية، كما سيتم إيقاف وضع التشغيل الدائم."</string>
-    <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"‏أنت متصل حاليًا بشبكة افتراضية خاصة (VPN). وإذا اتصلت بشبكة افتراضية خاصة أخرى، فسيتم استبدال شبكتك الافتراضية الخاصة الحالية."</string>
+    <string name="vpn_forget_long" msgid="2232239391189465752">"نسيان الشبكة الظاهرية الخاصة"</string>
+    <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"هل تريد استبدال الشبكة الظاهرية الخاصة الحالية؟"</string>
+    <string name="vpn_set_vpn_title" msgid="4009987321156037267">"هل تريد تشغيل الشبكة الظاهرية الخاصة باستمرار؟"</string>
+    <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"‏عند تشغيل هذا الإعداد، لن تتمكن من الاتصال بالإنترنت إلا بعد أن ينجح اتصال الشبكة الظاهرية الخاصة (VPN)"</string>
+    <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"‏سيتم استبدال شبكتك الظاهرية الخاصة (VPN) الحالية ولن تتمكن من استخدام اتصال الإنترنت إلا بعد أن ينجح اتصال الشبكة الظاهرية الخاصة"</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"‏أنت متصل حاليًا بشبكة ظاهرية خاصة (VPN) مضبوطة على وضع التشغيل الدائم. وإذا اتصلت بشبكة ظاهرية خاصة أخرى، فسيتم استبدال شبكتك الظاهرية الخاصة الحالية، كما سيتم إيقاف وضع التشغيل الدائم."</string>
+    <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"‏أنت متصل حاليًا بشبكة ظاهرية خاصة (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="1352832123114214283">"‏لا يتوافق هذا التطبيق مع الشبكة الافتراضية الخاصة (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_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">"‏لم تتم إضافة أية شبكات افتراضية خاصة (VPN)"</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>
     <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">"حظر أي اتصالات بدون شبكة افتراضية خاصة"</string>
-    <string name="vpn_require_connection_title" msgid="159053539340576331">"أيتطلب الأمر اتصالاً بشبكة افتراضية خاصة؟"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏حدد ملفًا شخصيًا للشبكة الافتراضية الخاصة (VPN) للاتصال الدائم بها. لن يتم السماح بحركة مرور الشبكة إلا عند الاتصال بهذه الشبكة الافتراضية الخاصة."</string>
+    <string name="vpn_require_connection" msgid="8388183166574269666">"حظر أي اتصالات بدون شبكة ظاهرية خاصة"</string>
+    <string name="vpn_require_connection_title" msgid="159053539340576331">"أيتطلب الأمر اتصالاً بشبكة ظاهرية خاصة؟"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"‏حدد ملفًا شخصيًا للشبكة الظاهرية الخاصة (VPN) للاتصال الدائم بها. لن يتم السماح بحركة مرور الشبكة إلا عند الاتصال بهذه الشبكة الظاهرية الخاصة."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"لا شيء"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"‏تتطلب الشبكة الافتراضية الخاصة (VPN) دائمة التشغيل عنوان IP لكل من الخادم ونظام أسماء النطاقات."</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"‏تتطلب الشبكة الظاهرية الخاصة (VPN) دائمة التشغيل عنوان IP لكل من الخادم ونظام أسماء النطاقات."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"ليس هناك اتصال بالشبكة. يُرجى إعادة المحاولة لاحقًا."</string>
-    <string name="vpn_disconnected" msgid="280531508768927471">"تم قطع الاتصال بالشبكة الافتراضية الخاصة"</string>
+    <string name="vpn_disconnected" msgid="280531508768927471">"تم قطع الاتصال بالشبكة الظاهرية الخاصة"</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>
@@ -2758,17 +2922,20 @@
       <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>
-    <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="query_hint_text" msgid="3350700807437473939">"إعدادات البحث"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"‏اتصال شبكة واي فاي wi-fi"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"رسالة نصية، إرسال رسالة، رسائل، مراسلة"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"‏خلوي، جوّال، مشغل شبكة جوال، لاسلكي، بيانات، جيل رابع، جيل ثالث، جيل ثاني، lte"</string>
@@ -2813,13 +2980,19 @@
     <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">"‏إعداد علامة NFC عبر Wi-Fi"</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_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="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>
@@ -2831,10 +3004,10 @@
     <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="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>
@@ -2873,8 +3046,8 @@
     <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_alarm_ringtone_title" msgid="1441926676833738891">"الصوت التلقائي لمنبّه العمل"</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>
@@ -2884,17 +3057,17 @@
     <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_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_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_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>
@@ -2908,10 +3081,10 @@
     <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_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="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>
@@ -2945,8 +3118,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>
@@ -2982,8 +3153,8 @@
     <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_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>
@@ -3036,14 +3207,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>
@@ -3093,11 +3264,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 +3271,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>
@@ -3118,7 +3284,7 @@
     <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="launch_by_default" msgid="1840761193189009248">"الفتح افتراضيًا"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"روابط الفتح"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"فتح الروابط المتوافقة"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"فتح بدون سؤال"</string>
@@ -3180,7 +3346,7 @@
     <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="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>
@@ -3239,6 +3405,16 @@
     <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>
+    <!-- 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>
@@ -3323,20 +3499,21 @@
     <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_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="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="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">"خدمة مساعد استريو مستمع الواقع الافتراضي"</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_0">%1$d</xliff:g> من <xliff:g id="COUNT_1">%2$d</xliff:g> تطبيق بالظهور فوق التطبيقات الأخرى"</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>
+    <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>
@@ -3348,8 +3525,6 @@
     <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_switch_title" msgid="3621381992793251070">"السماح بتثبيت تطبيقات من هذا المصدر"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"يمكنك اللف مرتين لفتح الكاميرا"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"يمكنك فتح تطبيق الكاميرا من خلال لف رسغك مرتين"</string>
@@ -3448,8 +3623,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> تحذير البيانات"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> تحذير البيانات / <xliff:g id="ID_2">%2$s</xliff:g> حد البيانات"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"دورة الفوترة"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"تبدأ الدورة الشهرية اعتبارًا من <xliff:g id="ID_1">%1$s</xliff:g> كل شهر"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"شهريًا اعتبارًا من <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"شهريًا في يوم <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"قيود الشبكات"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="zero"><xliff:g id="COUNT">%1$d</xliff:g> قيد</item>
@@ -3477,13 +3651,13 @@
       <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>
     <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>
@@ -3546,11 +3720,10 @@
     <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>
+    <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>
@@ -3623,28 +3796,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>
+    <!-- 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 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>
+    <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>
@@ -3695,7 +3895,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="zero"><xliff:g id="COUNT_1">%d</xliff:g> تطبيق</item>
       <item quantity="two">تطبيقان (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
@@ -3706,9 +3906,9 @@
     </plurals>
     <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_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>
     <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"بيانات اعتماد موثوقة"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
@@ -3776,18 +3976,24 @@
     <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="default_theme" msgid="7085644992078579076">"تلقائي"</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>
     <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>
+    <!-- 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-az/arrays.xml b/res/values-az/arrays.xml
index 0f5d59e..5a1f909 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Yaxşı"</item>
     <item msgid="8986346415847956850">"Əla"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Həmişə"</item>
-    <item msgid="844721238536786870">"Yalnız taxılı olduğu zaman"</item>
-    <item msgid="1986753720941888596">"Heç vaxt"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Həmişə"</item>
-    <item msgid="7433294150916905997">"Yalnız qoşulan zaman"</item>
-    <item msgid="1390404486722375028">"Heç vaxt"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Son 30 gün"</item>
     <item msgid="6600989128423965319">"İstifadə siklini əldə edin..."</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index e294610..0b12104 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Rədd edin"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Qapadın"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Keçid"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Naməlum"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Tərtibatçı olmaqdan <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> addım uzaqsınız.</item>
       <item quantity="one">Tərtibatçı olmaqdan <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> addım uzaqsınız.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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 ayarlarını dəyişməyə icazəniz yoxdur."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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> 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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Kilidi açma modelini dəyişin"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilidi açma PIN\'ini dəyişin"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilid parolunu dəyişdirin"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Yenidən cəhd edin. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> cəhddən <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> cəhd."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Son cəhd"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Bu cəhddə yanlış iş modeli daxil etsəniz, iş profiliniz və əlaqədar data bu cihazdan silinəcək."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Bu cəhddə yanlış iş PIN kodu daxil etsəniz, iş profiliniz və əlaqədar data bu cihazdan silinəcək."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Bu cəhddə yanlış iş parolu daxil etsəniz, iş profiliniz və əlaqədar data bu cihazdan silinəcək."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Həddindən çox yanlış cəhd. İş profiliniz və əlaqədar data bu cihazdan silinəcək."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Rədd edin"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Yenidən cəhd edin. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> cəhddən <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> cəhd."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Data silinəcək"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Növbəti cəhddə yanlış nümunə  daxil etsəniz, bu cihazın datası silinəcək"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Növbəti cəhddə yanlış nümunə daxil etsəniz, bu cihazın datası silinəcək"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Növbəti cəhddə yanlış parol daxil etsəniz, bu cihazın datası silinəcək"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Növbəti cəhddə yanlış nümunə daxil etsəniz, bu istifadəçi silinəcək"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Növbəti cəhddə yanlış PIN daxil etsəniz, bu istifadəçi silinəcək"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Növbəti cəhddə yanlış parol daxil etsəniz, bu istifadəçi silinəcək"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Növbəti cəhddə yanlış nümunə daxil etsəniz, iş profili və datası silinəcək"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Növbəti cəhddə yanlış PIN daxil etsəniz, iş profili və datası silinəcək"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Növbəti cəhddə yanlış parol daxil etsəniz, iş profili və datası silinəcək"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Həddindən artıq yanlış cəhd. Bu cihazın datası silinəcək."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Həddindən artıq yanlış cəhd. Bu istifadəçi silinəcək."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Həddindən artıq yanlış cəhd. Bu iş profili və datası silinəcək."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Rədd edin"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Ən az <xliff:g id="COUNT">%d</xliff:g> simvol olmalıdır"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN ən azı <xliff:g id="COUNT">%d</xliff:g> rəqəmli olmalıdır"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Davam"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Simsiz marşrut təhlükəsizlik ayarı (TKIP) dəstəklənmir"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentifikasiya uğursuzluğu. Yenə cəhd edin."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Başqa WPS sessiyası təsbit edildi. Lütfən, bir neçə dəqiqə sonra yenidən cəhd edin."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi bağlantısı kəsildi. WPS quraşdırması ləğv edildi."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Şəbəkə adı"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID daxil edin"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Təhlükəsizlik"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Başlama vaxtı"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Bitmə tarixi"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"AKTİV / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Bildirişlər aldığınız zaman ekran oyansın"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Həmişə aktiv"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vaxt, bildiriş ikonası və digər məlumatları göstərin"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Şrift ölçüsü"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Mətni kiçildin və ya böyüdün"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SİM kart kilidi parametrləri"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD kartı sil"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Daxili USB yaddaşında mahnı və ya şəkil kimi bütün datanı sil"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD kartda musiqi və foto kimi bütün məlumatları silin."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM\'ləri silin"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Telefondakı ütün eSIM\'ləri silin. Bununla mobil servis planı ləğv edilməyəcək."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Planşetdəki bütün eSIM\'ləri silin. Bununla mobil servis planı ləğv edilməyəcək."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Planşeti sıfırlayın"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefonu sıfırlayın"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Bütün şəxsi məlumatlarınız və endirilmiş tətbiqlər silinsin? Bu əməliyyatı geri qaytara bilməyəcəksiniz!!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Proses gedir"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB yaddaş"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartda"</string>
+    <string name="disabled" msgid="9206776641295849915">"Deaktiv"</string>
     <string name="not_installed" msgid="2797554494953450291">"Bu istifadəçi üçün quraşdırılmayıb"</string>
     <string name="installed" msgid="3070865169422600098">"Quraşdırıldı"</string>
     <string name="no_applications" msgid="7336588977497084921">"Tətbiq yoxdur."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"İşartı"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Defolt tətbiqlər"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Dil, vaxt, yedəkləmə, yeniliklər"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Ayarları axtarın"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Ayarları axtarın"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Axtarış ayarları"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Axtarış ayarları"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, şəbəkə bağlantısı"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mətn mesajı, mətn yazmaq, mesajlar, mesaj yazmaq"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"şəbəkə, mobil, şəbəkə operatoru, simsiz, data, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"jest"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ödəyin, tıklayın, ödəmələr"</string>
     <string name="keywords_backup" msgid="470070289135403022">"yedəkləmə, yedəkləyin"</string>
+    <!-- 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 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>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Naməlum tətbiqlərin quraşdırılması"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Tətbiqin sistem ayarlarını dəyişdirmə icazəsi"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Sistem ayarlarını dəyişdirməyə imkan verin"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Bu icazə tətbiqə sistem ayarlarını dəyişdirməyə imkan verir."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Bəli"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Xeyr"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Bu mənbədən icazə verin"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera üçün iki dəfə burun"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Biləyinizi iki dəfə buraraq kamera tətbiqini açın"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Təlimat"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"İndi yer boşaldın"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Jestlər"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"İşarə qısayolları"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonu idarə etmək üçün cəld jestlər"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Planşeti idarə etmək üçün cəld jestlər"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Cihazı idarə etmək üçün cəld jestlər"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraya keçin"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kameranı cəld açmaq üçün, enerji düyməsinə iki dəfə basın. İstənilən ekranda işləyir."</string>
+    <!-- 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">"Kameranı çevirin"</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">"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>
+    <!-- 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">"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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Bildirişlər üçün barmağınızı sürüşdürün"</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">"Bildirişlər üçün barmaq izini sürüşdürün"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirişləri yoxlamaq üçün, barmaq sensorunda aşağı sürüşdürün."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirişləri yoxlamaq üçün, planşetin arxasındakı barmaq sensorunda aşağı sürüşdürün."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Bildirişləri yoxlamaq üçün, cihazın arxasındakı barmaq sensorunda aşağı sürüşdürün."</string>
+    <!-- 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">"Kameranı açmaq üçün qaldırın"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kameranı avtomatik olaraq açmaq üçün telefonu foto çəkəcəyiniz pozisiyaya qaldırın (mənzərə və ya portret). Telefon, yuxu rejimində və ya kiliddə olan zaman işləyir."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Telefon yuxu rejimində və ya kiliddə olarkən fotolar çəkin"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Köməkçi işarə"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Həssaslıq"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 254091e..f5a74d0 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobra"</item>
     <item msgid="8986346415847956850">"Odlična"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Uvek"</item>
-    <item msgid="844721238536786870">"Samo kad se puni"</item>
-    <item msgid="1986753720941888596">"Nikad"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Uvek"</item>
-    <item msgid="7433294150916905997">"Samo kad se puni"</item>
-    <item msgid="1390404486722375028">"Nikada"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Poslednjih 30 dana"</item>
     <item msgid="6600989128423965319">"Podesi ciklus potrošnje..."</item>
@@ -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 2fcfb2a..1f05712 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_off_subtext (7746761268472599794) -->
+    <!-- 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_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) -->
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
     <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>
+    <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth privezivanje"</string>
-    <!-- no translation found for bluetooth_tethering_available_subtext (2092766774943506688) -->
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_available_subtext (313873759999970236) -->
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_device_connected_subtext (6388191062495199481) -->
-    <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) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1838503633450298902) -->
-    <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 789bf3b..5b1d2d2 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добры"</item>
     <item msgid="8986346415847956850">"Выдатны"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Заўсёды"</item>
-    <item msgid="844721238536786870">"Толькі калі падлучаны"</item>
-    <item msgid="1986753720941888596">"Ніколі"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Заўсёды"</item>
-    <item msgid="7433294150916905997">"Толькі калі падлучаны"</item>
-    <item msgid="1390404486722375028">"Ніколі"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Апошнія 30 дзён"</item>
     <item msgid="6600989128423965319">"Заданне цыклу расходу..."</item>
@@ -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 2284019..fa0cd07 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_off_subtext (7746761268472599794) -->
+    <!-- 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_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) -->
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
     <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>
+    <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-мадэм"</string>
-    <!-- no translation found for bluetooth_tethering_available_subtext (2092766774943506688) -->
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_available_subtext (313873759999970236) -->
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_device_connected_subtext (6388191062495199481) -->
-    <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) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1838503633450298902) -->
-    <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 297e349..40d14ba 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добър"</item>
     <item msgid="8986346415847956850">"Отличен"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Винаги"</item>
-    <item msgid="844721238536786870">"Само при включено захранване"</item>
-    <item msgid="1986753720941888596">"Никога"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Винаги"</item>
-    <item msgid="7433294150916905997">"Само при включено захранване"</item>
-    <item msgid="1390404486722375028">"Никога"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Последните 30 дни"</item>
     <item msgid="6600989128423965319">"Цикъл на пренос..."</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 968d695..c2473a1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -23,13 +23,13 @@
     <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="other">Вече сте на <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> стъпки от това, да бъдете програмист.</item>
       <item quantity="one">Вече сте на <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> стъпка от това, да бъдете програмист.</item>
     </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 +41,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 +107,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>
@@ -121,7 +138,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">"Докоснете за сдвояване с/ъс „<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">"Изберете устройство"</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 +175,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 картата ви. Предоставянето му ще деактивира мобилните данни на устройството ви за продължителността на връзката. Разрешаване на достъпа до <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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
+    <!-- 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">"ОK"</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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Промяна на фигурата за отключване"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промяна на PIN кода за отключване"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промяна на паролата за отключване"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Опитайте отново. Опит <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> от <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Последен опит"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ако въведете неправилна фигура при този опит, служебният ви потребителски профил и свързаните с него данни ще бъдат премахнати от това устройство."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ако въведете неправилен ПИН код при този опит, служебният ви потребителски профил и свързаните с него данни ще бъдат премахнати от това устройство."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ако въведете неправилна парола при този опит, служебният ви потребителски профил и свързаните с него данни ще бъдат премахнати от това устройство."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Твърде много неправилни опити. Служебният ви потребителски профил и свързаните с него данни ще бъдат премахнати от това устройство."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Отхвърляне"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Опитайте отново. Опит <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> от <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Данните ви ще бъдат изтрити"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ако въведете неправилна фигура при следващия опит, данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ако въведете неправилен ПИН код при следващия опит, данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ако въведете неправилна парола при следващия опит, данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ако въведете неправилна фигура при следващия опит, този потребител ще бъде изтрит."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ако въведете неправилен ПИН код при следващия опит, този потребител ще бъде изтрит."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ако въведете неправилна парола при следващия опит, този потребител ще бъде изтрит."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ако въведете неправилна фигура при следващия опит, служебният ви потребителски профил и данните в него ще бъдат изтрити."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ако въведете неправилен ПИН код при следващия опит, служебният ви потребителски профил и данните в него ще бъдат изтрити."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ако въведете неправилна парола при следващия опит, служебният ви потребителски профил и данните в него ще бъдат изтрити."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Твърде много неправилни опити. Данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Твърде много неправилни опити. Този потребител ще бъде изтрит."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Твърде много неправилни опити. Този служебен потребителски профил и данните в него ще бъдат изтрити."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Отхвърляне"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Трябва да съдържа поне <xliff:g id="COUNT">%d</xliff:g> знака"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ПИН кодът трябва да съдържа поне <xliff:g id="COUNT">%d</xliff:g> цифри"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Напред"</string>
@@ -574,7 +622,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">"Trust agents"</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">
@@ -619,13 +667,29 @@
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Свързване"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Изключване"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Сдвояване и свързване"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Прекратяване на сдвояването"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Раздвояване"</string>
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"Име на мрежата"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Въведете SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Сигурност"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"Точката за достъп се включва…"</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Изтриване на SD картата"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Изтриване на всички данни във вътрешното USB хранилище, като музика или снимки"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Да се изтриват всички данни в SD картата, като музика или снимки"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Изтриване на ел. SIM карти"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Изтрийте всички електронни SIM карти на телефона. Това действие няма да анулира плана ви за мобилна услуга."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Изтрийте всички електронни SIM карти на таблета. Това действие няма да анулира плана ви за мобилна услуга."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Възстановяване на таблета"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Нулиране на телефона"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Да се изтрият ли цялата ви лична информация и всички изтеглени приложения? Не можете да отмените това действие!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"На SD карта"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Съдействие при въвеждане"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
@@ -1953,7 +2110,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>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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="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>
@@ -2654,9 +2814,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>
@@ -2664,7 +2827,7 @@
     <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="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>
@@ -2709,6 +2872,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: Настр."</string>
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"За записване докоснете маркер..."</string>
@@ -2827,14 +2996,12 @@
     <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_empty_text" msgid="685224245260197779">"Никое от инсталираните приложения не поддържа режим „Картина в картината“"</string>
-    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"картина в картината"</string>
-    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Картина в картината"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Разрешаване на режима „Картина в картината“"</string>
-    <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="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">"картина в картина, картина в"</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="manage_zen_access_title" msgid="2611116122628520522">"Достъп до „Не безпокойте“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Никое инсталирано приложение не е заявило достъп до „Не безпокойте“"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -3093,8 +3255,14 @@
     <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="other">Поведението на <xliff:g id="NUMBER">%2$d</xliff:g> приложения е необичайно</item>
+      <item quantity="one">Поведението на <xliff:g id="APP">%1$s</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>
@@ -3187,8 +3355,9 @@
     <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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"Разрешаване от този източник"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Завъртане два пъти за достъп до камерата"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Отворете приложението Камера с двукратно завъртане на китката си"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">1 приложение може да използва неограничено количество данни при включена Икономия на данни</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Икономия на данни"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Неограничен достъп до данни"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Неограничен достъп до данни"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Данните на заден план са изключени"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Включено"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Изключено"</string>
@@ -3382,7 +3548,6 @@
     <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_warning" msgid="9086859595338944882">"SMS съобщенията, за които се таксува получателят, може да ви въвлекат в разходи и ще увеличат сметката към оператора ви. Ако дадете разрешението на дадено приложение, ще можете да изпращате такива съобщения чрез него."</string>
@@ -3447,28 +3612,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-bn/arrays.xml b/res/values-bn/arrays.xml
index 677e7c2..cca163c 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ভাল"</item>
     <item msgid="8986346415847956850">"খুব ভাল"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"সবসময়"</item>
-    <item msgid="844721238536786870">"কেবলমাত্র যখন প্লাগ ইন তখন"</item>
-    <item msgid="1986753720941888596">"কখনো নয়"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"সবসময়"</item>
-    <item msgid="7433294150916905997">"কেবলমাত্র যখন প্লাগ ইন তখন"</item>
-    <item msgid="1390404486722375028">"কখনই নয়"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"গত ৩০ দিন"</item>
     <item msgid="6600989128423965319">"ব্যবহার চক্র সেট করুন..."</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 3986bc8..14c89d8 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -20,16 +20,16 @@
     <string name="no" msgid="6731231425810196216">"না"</string>
     <string name="create" msgid="3578857613172647409">"তৈরি করুন"</string>
     <string name="allow" msgid="3349662621170855910">"অনুমতি দিন"</string>
-    <string name="deny" msgid="6947806159746484865">"অস্বীকার করুন"</string>
+    <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="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="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 +41,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>
@@ -94,10 +95,10 @@
     <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_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_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>
@@ -106,10 +107,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">"আপনার কাছে ব্লুটুথ সেটিংস পরিবর্তন করার অনুমতি নেই৷"</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> কাছাকাছি ডিভাইসগুলির কাছে দৃশ্যমান হয়৷"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- 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) -->
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"অ্যাকাউন্টগুলি"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"অবস্থান"</string>
     <string name="account_settings_title" msgid="626177544686329806">"অ্যাকাউন্টগুলি"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"নিরাপত্তা এবং অবস্থান"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"এনক্রিপশান ও শংসাপত্র"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ফোন এনক্রিপশন"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ডিভাইসটি এনক্রিপ্টেড"</string>
@@ -345,7 +369,7 @@
     <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_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>
@@ -353,41 +377,56 @@
     <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দ্রষ্টব্য: আপনার আঙ্গুলের ছাপ একটি জটিল প্যাটার্ন বা 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_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>
@@ -408,14 +447,14 @@
     <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_dialog_need_password_title" msgid="4058971800557767">"কোনও লক স্ক্রিন পিন বা পাসওয়ার্ড নেই"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"এনক্রিপশন শুরু করার আগে আপনাকে লক স্ক্রিন পিন বা পাসওয়ার্ড সেট করতে হবে।"</string>
+    <string name="crypt_keeper_dialog_need_password_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>
@@ -435,27 +474,29 @@
     <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_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" 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_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_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,7 +508,7 @@
     <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>
@@ -480,7 +521,7 @@
     <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_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>
@@ -490,15 +531,15 @@
     <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>
+</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>
+</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">
 
@@ -506,26 +547,34 @@
     <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>
+</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">
+    <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>
+</xliff:g>এছাড়াও আপনার সংরক্ষিত আঙ্গুলের ছাপগুলিকে এই প্রোফাইল থেকে সরিয়ে দেওয়া হবে এবং আপনি সেগুলি দিয়ে আপনার প্রোফাইল আনলক করতে, কেনাকাটিতে অনুমোদন দিতে, বা অ্যাপ্লিকেশানগুলিতে প্রবেশ করতে পারবেন না৷\""</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="TOTAL_ATTEMPTS">%2$d</xliff:g>টির মধ্যে <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> নম্বর প্রচেষ্টা৷"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"শেষ চেষ্টা"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"আপনি যদি এই প্রচেষ্টায় কোনো ভুল কাজের প্যার্টান দেন তাহলে আপনার কর্মস্থলের প্রোফাইল এবং সম্পর্কিত ডেটা এই ডিভাইস থেকে সরানো হবে৷"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"আপনি যদি এই প্রচেষ্টায় কোনও ভুল কাজের পিন দেন তাহলে আপনার অফিস প্রোফাইল এবং সম্পর্কিত ডেটা এই ডিভাইস থেকে সরানো হবে৷"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"আপনি যদি এই প্রচেষ্টায় কোনো ভুল কাজের পাসওয়ার্ড দেন তাহলে আপনার কর্মস্থলের প্রোফাইল এবং সম্পর্কিত ডেটা এই ডিভাইস থেকে সরানো হবে৷"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"অনেক বার ভুল প্রচেষ্টা করা হয়েছে৷ আপনার কর্মস্থলের প্রোফাইল এবং সম্পর্কিত ডেটা এই ডিভাইস থেকে সরানো হবে৷"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"খারিজ করুন"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"আবার চেষ্টা করুন৷ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>টি প্রচেষ্টার মধ্যে <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> নম্বর৷"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"আপনার ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"আপনি যদি পরের বারেও ভুল প্যাটার্ন আঁকেন, তাহলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"আপনি যদি পরের বারেও ভুল পিন দেন, তাহলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"আপনি যদি পরের বারেও ভুল পাসওয়ার্ড দেন, তাহলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"আপনি যদি পরের বারেও ভুল প্যাটার্ন আঁকেন, তাহলে ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"আপনি যদি পরের বারেও ভুল পিন দেন, তাহলে ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"আপনি যদি পরের বারেও ভুল পাসওয়ার্ড দেন, তাহলে ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"আপনি যদি পরের বারেও ভুল প্যাটার্ন আঁকেন, তাহলে আপনার কর্মস্থলের প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"আপনি যদি পরের বারেও ভুল পিন দেন, তাহলে আপনার কর্মস্থলের প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"আপনি যদি পরের বারেও ভুল পাসওয়ার্ড দেন, তাহলে আপনার কর্মস্থলের প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"বহুবার ভুল ইনপুট দিয়েছেন। এই ডিভাইসের ডেটা মুছে দেওয়া হবে।"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"বহুবার ভুল ইনপুট দিয়েছেন। ব্যবহারকারীর তালিকা থেকে আপনাকে মুছে দেওয়া হবে।"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"বহুবার ভুল ইনপুট দিয়েছেন। এই কর্মস্থলের প্রোফাইল এবং প্রোফাইলের ডেটা মুছে দেওয়া হবে।"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"খারিজ করুন"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"কমপক্ষে <xliff:g id="COUNT">%d</xliff:g>টি অক্ষর থাকতে হবে"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"পিন কমপক্ষে <xliff:g id="COUNT">%d</xliff:g>টি সংখ্যার হতে হবে"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"চালিয়ে যান"</string>
@@ -575,7 +624,7 @@
       <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>
@@ -597,14 +646,14 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"এর সঙ্গে যুক্ত করতে:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;নিশ্চিত করুন যে এটি এই পাস কী দেখাচ্ছে:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"এর থেকে:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;এই ডিভাইসের সঙ্গে যুক্ত করবেন?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"এর সঙ্গে যুক্ত করতে:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>এটিতে টাইপ করুন:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, তারপর Return বা Enter টিপুন।"</string>
-    <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>
     <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_keyboard_option" msgid="2271954176947879628">"কীবোর্ড"</string>
@@ -612,20 +661,36 @@
     <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>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"সংযোগ বিচ্ছিন্ন করুন"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"যুক্ত করুন &amp; সংযুক্ত করুন"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"চেনা তালিকে থেকে সরান"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"সংযোগ বিচ্ছিন্ন করুন ও চেনা তালিকে থেকে সরান"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"বিযুক্ত করুন"</string>
+    <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>
+    <!-- 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>
@@ -633,7 +698,7 @@
     <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_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>
@@ -738,7 +803,7 @@
     <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_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>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS ইতিমধ্যে প্রগতিতে রয়েছে এবং সম্পূর্ণ হতে দুই মিনিট পর্যন্ত সময় নেবে"</string>
@@ -747,7 +812,6 @@
     <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">"ওয়াই-ফাই সংযোগ বিচ্ছিন্ন হয়েছে। 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>
@@ -810,7 +874,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>
@@ -847,9 +910,28 @@
     <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>
+    <!-- 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_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">"হটস্পট চালু হচ্ছে..."</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 +978,7 @@
     <item msgid="6200207341126893791">"১"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ওয়াই-ফাই কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশী শক্তিশালী তার উপর নির্ভর করে আপনার ফোন ওয়াই-ফাই নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"জরুরী ঠিকানা আপডেট করুন"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"আপনি যদি ওয়াই ফাই ব্যবহার করে ৯১১ এ কল করেন তাহলে জরুরি পরিষেবাগুলি  আপনার অবস্থান হিসাবে আপনার ঠিকানাকে ব্যবহার করে৷"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
@@ -916,7 +999,7 @@
     <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">"সঙ্গীত, ভিডিও, গেম্স, ও অন্যান্য মিডিয়া"</string>
@@ -952,7 +1035,7 @@
     <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="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 +1063,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1113,19 @@
     <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>
+    <!-- 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">"সিম কার্ড লক সেটিংস"</string>
@@ -1057,8 +1161,8 @@
     <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>
+      <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>
@@ -1071,8 +1175,8 @@
     <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="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>
@@ -1273,6 +1377,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>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD কার্ড মুছে ফেলুন"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"অভ্যন্তরীণ USB সঞ্চয়স্থানের সমস্ত ডেটা মুছে দিন, যেমন সঙ্গীত বা ফটো"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD কার্ডের সমস্ত তথ্য মুছে দিন, যেমন সঙ্গীত এবং ফটো"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"ই-সিম মুছুন"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"আপনার ফোন থেকে সব ই-সিম মুছে দিন। মুছে দিলেও আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"আপনার ট্যাবলেট থেকে সব ই-সিম মুছে দিন। মুছে দিলেও আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ট্যাবলেট আবার সেট করুন"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ফোন আবার সেট করুন"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"আপনার সমস্ত ব্যক্তিগত তথ্য এবং ডাউনলোড করা অ্যাপ্লিকেশানগুলি মুছে দিতে চান? আপনি এই প্রক্রিয়াটি পূর্বাবস্থায় ফেরাতে পারবেন না!"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"অবস্থান মোড"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"অবস্থান নির্ধারণ করতে জিপিএস, ওয়াই ফাই, ব্লুটুথ, বা মোবাইল নেটওয়ার্ক ব্যবহার করুন"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"অবস্থান নির্ধারণ করতে ওয়াই ফাই, ব্লুটুথ, বা মোবাইল নেটওয়ার্ক ব্যবহার করুন"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"অবস্থান নির্ণয় করতে GPS ব্যবহার করুন"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"অবস্থান নির্ণয় করতে GPS এবং ডিভাইস সেন্সর ব্যবহার করুন"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"স্ক্যান করা হচ্ছে"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ওয়াই-ফাই স্ক্যানিং"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"যে কোনো সময়ে ওয়াই-ফাই নেটওয়ার্কগুলিকে সনাক্ত করার জন্য সিস্টেম অ্যাপ্লিকেশান এবং পরিষেবাগুলিকে অনুমতি দিয়ে অবস্থান উন্নত করুন।"</string>
@@ -1436,13 +1538,13 @@
     <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_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_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_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>
@@ -1475,7 +1577,7 @@
     <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_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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1539,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>
@@ -1550,6 +1658,7 @@
     <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="default" msgid="1477351142334784771">"SD কার্ডে"</string>
+    <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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ইনপুট সহায়তা"</string>
@@ -1731,7 +1845,7 @@
     <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="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"অন-স্ক্রিন কীবোর্ড সেটিংস"</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>
@@ -1854,8 +1968,8 @@
     <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_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>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"CPU মোট"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ফোরগ্রাউন্ড"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"জাগ্রত রাখুন"</string>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2142,7 +2303,7 @@
     <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_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>
@@ -2159,8 +2320,8 @@
     <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="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>
@@ -2226,10 +2387,10 @@
     <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" 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_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>
@@ -2261,7 +2422,7 @@
     <!-- 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>
@@ -2287,7 +2448,7 @@
     <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_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">"ওয়াই-ফাই দেখান"</string>
@@ -2326,10 +2487,10 @@
     <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" 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_auto_sync_on_dialog_title" msgid="2438617846762244389">"ডেটা স্বতঃ সিঙ্ক চালু করবেন?"</string>
@@ -2345,7 +2506,7 @@
     <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_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>
@@ -2480,7 +2641,7 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ব্যবহারকারী অথবা প্রোফাইল যোগ করুন"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ব্যবহারকারীকে যোগ করুন"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"সীমাবদ্ধ প্রোফাইল"</string>
-    <string name="user_need_lock_message" msgid="5879715064416886811">"আপনি একটি সীমাবদ্ধযুক্ত প্রোফাইল তৈরি করার আগে, আপনাকে আপনার অ্যাপ্লিকেশন এবং ব্যক্তিগত ডেটা সুরক্ষিত করার জন্য একটি স্ক্রিন লক সেট-আপ করতে হবে।"</string>
+    <string name="user_need_lock_message" msgid="5879715064416886811">"আপনি একটি সীমাবদ্ধযুক্ত প্রোফাইল তৈরি করার আগে, আপনাকে আপনার অ্যাপ্লিকেশান এবং ব্যক্তিগত ডেটা সুরক্ষিত করার জন্য একটি স্ক্রীন লক সেট আপ করতে হবে।"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"লক সেট করুন"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"সেট আপ করা নেই"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"সেট আপ করা নেই - সীমাবদ্ধ প্রোফাইল"</string>
@@ -2506,7 +2667,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>
@@ -2596,7 +2757,7 @@
     <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_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>
@@ -2654,17 +2815,20 @@
       <item quantity="other">%dটি লুকানো আইটেম দেখান</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"নেটওয়ার্ক ও ইন্টারনেট"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"ওয়াই ফাই, মোবাইল, ডেটার ব্যবহার, হটস্পট"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"মোবাইল"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ডেটার ব্যবহার"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"হটস্পট"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"সংযুক্ত ডিভাইস"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"ব্লুটুথ, কাস্ট, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"ব্লুটুথ, কাস্ট করা"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"অ্যাপ্স &amp; বিজ্ঞপ্তি"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"অনুমতিগুলি, ডিফল্ট অ্যাপ্স"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ব্যবহারকারী এবং অ্যাকাউন্টগুলি"</string>
     <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_mobile_networks" msgid="8995946622054642367">"সেলুলার, মোবাইল, সেলুলার পরিষেবা প্রদানকারী, ওয়্যারলেস, ডেটা, 4g, 3g, 2g, lte"</string>
@@ -2693,22 +2857,28 @@
     <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_ignore_optimizations" msgid="6102579291119055029">"অপ্টিমাইজেশন উপেক্ষা করুন, ডজ করুন, অ্যাপ্লিকেশন স্ট্যান্ডবাই"</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="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">"ওয়াই-ফাই NFC ট্যাগ সেটআপ করুন"</string>
     <string name="write_tag" msgid="8571858602896222537">"লিখুন"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"লিখতে একটি ট্যাগে আলতো চাপুন..."</string>
@@ -2833,8 +3003,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>
@@ -2956,8 +3124,8 @@
     <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\n১. স্ক্রিন পিন করা চালু আছে কিনা নিশ্চিত করুন।\n\n২. আপনি যে স্ক্রিনটি পিন করতে চান সেটি খুলুন।\n\n৩. \'এক নজরে\' এ আলতো চাপুন।\n\n৪. উপরের দিকে সোয়াইপ করে \'পিন করুন\' আইকনে আলতো চাপুন।"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"স্ক্রীন পিন করা"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"এই সেটিং চালু থাকার সময়ে, আপনি আনপিন না করা পর্যন্ত বর্তমান স্ক্রীনটিকে দৃশ্যমান রাখতে স্ক্রীন পিন করা ব্যবহার করতে পারেন।\n\nস্ক্রীন পিন ব্যবহার:\n\n১. স্ক্রীন পিন করা চালু আছে কিনা নিশ্চিত করুন।\n\n২. আপনি যে স্ক্রীনটি পিন করতে চান সেটি খুলুন।\n\n৩. \'এক নজরে\' এ আলতো চাপুন।\n\n৪. উপরের দিকে সোয়াইপ করে \'পিন করুন\' আইকনে আলতো চাপুন।"</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,22 +3133,17 @@
     <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_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_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>
+    <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>
@@ -3095,6 +3258,12 @@
     <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>
+    <!-- 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>
@@ -3132,7 +3301,7 @@
     <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_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>
@@ -3187,8 +3356,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="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>
@@ -3200,8 +3370,6 @@
     <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_switch_title" msgid="3621381992793251070">"এই উৎস থেকে আসা অ্যাপগুলিকে অনুমতি দিন"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"ক্যামেরার জন্য দুবার ঝাঁকান"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"আপনার কব্জি দুবার ঝাঁকিয়ে ক্যামেরা অ্যাপ্লিকেশানটি খুলুন"</string>
@@ -3209,7 +3377,7 @@
     <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_make_smaller_desc" msgid="4622359904253364742">"আরো ছোট করুন"</string>
@@ -3267,11 +3435,11 @@
     <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>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"ব্যাকগ্রাউন্ড ডেটা শুধুমাত্র ওয়াই-ফাই এর মাধ্যমে উপলব্ধ হয়৷ ওয়াই-ফাই উপলব্ধ না থাকলে এটি কিছু অ্যাপ্লিকেশন এবং পরিষেবায় প্রভাব ফেলতে পারে৷"</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>
@@ -3296,8 +3464,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 +3484,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>
@@ -3327,7 +3494,7 @@
     <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_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>
@@ -3378,11 +3545,10 @@
     <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_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="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>
@@ -3447,28 +3613,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="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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-bs/arrays.xml b/res/values-bs/arrays.xml
index b5de1a9..edb66b6 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 6dcddda..5868c1a 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 />
+    <!-- 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_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>
-    <!-- no translation found for wifi_tether_enabled_subtext (7842111748046063857) -->
-    <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_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>
-    <!-- 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 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) -->
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
     <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>
+    <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dijeljenje Bluetooth veze"</string>
-    <!-- no translation found for bluetooth_tethering_available_subtext (2092766774943506688) -->
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_available_subtext (313873759999970236) -->
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_device_connected_subtext (6388191062495199481) -->
-    <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) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1838503633450298902) -->
-    <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 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">"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) -->
+    <!-- no translation found for ambient_display_pickup_summary (4567020486787561873) -->
     <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 (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 2775ab8..4efc4cf 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -145,18 +145,8 @@
     <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="5013973108901348144">"Els darrers 30 dies"</item>
     <item msgid="6600989128423965319">"Defineix el cicle d\'ús..."</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
@@ -260,7 +250,7 @@
     <item msgid="8281201165558093009">"exploració de Wi-Fi"</item>
     <item msgid="8694611243479480497">"notificació"</item>
     <item msgid="7776439107987345446">"exploració de cel·la"</item>
-    <item msgid="514615766544675057">"trucada"</item>
+    <item msgid="514615766544675057">"trucada de telèfon"</item>
     <item msgid="8181415497109310680">"llegeix SMS"</item>
     <item msgid="6816551144382117307">"escriu SMS"</item>
     <item msgid="4600463921908905030">"rep SMS"</item>
@@ -327,7 +317,7 @@
     <item msgid="1638204101698708656">"Ubicació"</item>
     <item msgid="2154671955760380322">"Notificació de la publicació"</item>
     <item msgid="4282477730595931828">"Ubicació"</item>
-    <item msgid="4891423912898525905">"Trucada"</item>
+    <item msgid="4891423912898525905">"Trucada de telèfon"</item>
     <item msgid="2623604824935968113">"Llegeix l\'SMS/MMS"</item>
     <item msgid="4420177125221176306">"Escriu un SMS/MMS"</item>
     <item msgid="3986142739951490025">"Rep SMS/MMS"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a4832ba..39e2024 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Denega"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Tanca"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Canvia"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconegut"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Ara només et queden <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos per convertir-te en desenvolupador.</item>
       <item quantity="one">Ara només et queda <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> pas per convertir-te en desenvolupador.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"No tens permís per canviar la configuració del Bluetooth."</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> serà visible per a dispositius propers mentre la configuració de Bluetooth estigui oberta."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Els teus dispositius"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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>
@@ -353,41 +376,56 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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" msgid="3508870672887336095">"Només cal que toquis el sensor d\'empremtes digitals per desbloquejar el telèfon, autoritzar compres o iniciar la sessió en aplicacions. Vés amb compte amb les empremtes digitals d\'altres persones que hi afegeixis, perquè totes podran dur a terme aquestes accions.\n\nNota: fer servir l\'empremta digital pot ser menys segur que utilitzar un patró o un PIN complets."</string>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"No s\'ha completat la inscripció"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"S\'ha esgotat el temps d\'espera per inscriure l\'empremta digital. Torna-ho a provar."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"La inscripció de l\'empremta digital no ha funcionat. Torna-ho a provar o fes servir un altre dit."</string>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Canvia el patró de desbloqueig"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Canvia el PIN de desbloqueig"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Canvia la contrasenya de desbloqueig"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Torna-ho a provar. Intent número <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> (<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> en total)."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Última oportunitat"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si tornes a introduir un patró incorrecte, el teu perfil professional i les dades associades se suprimiran del dispositiu."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si tornes a introduir un PIN incorrecte, el teu perfil professional i les dades associades se suprimiran del dispositiu."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si tornes a introduir una contrasenya incorrecta, el teu perfil professional i les dades associades se suprimiran del dispositiu."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Has superat el nombre d\'intents incorrectes permesos. El teu perfil professional i les dades associades se suprimiran del dispositiu."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignora"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Torna-ho a provar. Intent <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Se suprimiran les teves dades"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si tornes a introduir un patró incorrecte, se suprimiran les dades del dispositiu"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si tornes a introduir un PIN incorrecte, se suprimiran les dades del dispositiu"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si tornes a introduir una contrasenya incorrecta, se suprimiran les dades del dispositiu"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si tornes a introduir un patró incorrecte, se suprimirà l\'usuari"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si tornes a introduir un PIN incorrecte, se suprimirà l\'usuari"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si tornes a introduir una contrasenya incorrecta, se suprimirà l\'usuari"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si tornes a introduir un patró incorrecte, se suprimirà el perfil professional i les dades que contingui"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si tornes a introduir un PIN incorrecte, se suprimirà el perfil professional i les dades que contingui"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si tornes a introduir una contrasenya incorrecta, se suprimirà el perfil professional i les dades que contingui"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Has superat el nombre d\'intents incorrectes permesos. Se suprimiran les dades del dispositiu."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Has superat el nombre d\'intents incorrectes permesos. Se suprimirà l\'usuari."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Has superat el nombre d\'intents incorrectes permesos. Se suprimirà el perfil professional i les dades que contingui."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignora"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Ha de tenir com a mínim <xliff:g id="COUNT">%d</xliff:g> caràcters"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"El PIN ha de tenir com a mínim <xliff:g id="COUNT">%d</xliff:g> dígits"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
@@ -575,7 +623,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-lo, 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 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuració de seguretat de l\'encaminador sense fils (TKIP) no és compatible"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Error d\'autenticació. Torna-ho a provar."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"S\'ha detectat una altra sessió de WPS. Torna-ho a provar d\'aquí a una estona."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"S\'ha desconnectat la Wi-Fi i s\'ha cancel·lat la configuració WPS."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nom de la xarxa"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Introdueix el SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguretat"</string>
@@ -767,7 +830,7 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitat anònima"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Contrasenya"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Mostra la contrasenya"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecciona la banda del punt d\'accés"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecciona la banda AP"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Banda de 2,4 GHz"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Banda de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Configuració IP"</string>
@@ -784,7 +847,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introdueix la contrasenya de la xarxa."</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per millorar la precisió de la ubicació i per a altres finalitats, <xliff:g id="APP_NAME">%1$s</xliff:g> vol activar la cerca de xarxes tot i que la connexió Wi-Fi estigui desactivada.\n\nVols permetre-ho per a totes les aplicacions que vulguin cercar xarxes?"</string>
-    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Per desactivar aquesta funció, ves a Configuració avançada al menú addicional."</string>
+    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Per desactivar aquesta funció, vés a Configuració avançada al menú addicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permet"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Denega"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vols iniciar la sessió per connectar-te?"</string>
@@ -793,8 +856,8 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Aquesta xarxa no té accés a Internet. Vols mantenir-hi la connexió?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"No ho tornis a preguntar en aquesta xarxa"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"La Wi‑Fi no està connectada a Internet"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"Pots canviar a la xarxa mòbil sempre que la connexió Wi‑Fi no sigui prou bona. És possible que s\'hi apliquin càrrecs per ús de dades."</string>
-    <string name="lost_internet_access_switch" msgid="2262459569601190039">"Canvia a la xarxa mòbil"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"Pots canviar a la xarxa de telefonia mòbil sempre que la connexió Wi‑Fi no sigui prou bona. És possible que s\'hi apliquin càrrecs per ús de dades."</string>
+    <string name="lost_internet_access_switch" msgid="2262459569601190039">"Canvia a la xarxa de telefonia mòbil"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Mantén la connexió a la Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"No ho mostris mai més"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connecta"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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>
@@ -861,7 +942,7 @@
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Trucades per Wi-Fi"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Activa Trucades per Wi-Fi"</string>
-    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Utilitza una Wi-Fi en comptes de la xarxa mòbil"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Utilitza una Wi-Fi en comptes de la xarxa de telefonia mòbil"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferències de trucada"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Mode de trucades per Wi-Fi"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferència en itinerància"</string>
@@ -896,6 +977,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>
@@ -980,24 +1062,34 @@
     <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>
+    <!-- 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">"Hora d’inici"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalització"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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="screen_timeout" msgid="4351334843529712571">"Repòs després de"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desactivada / <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">"Activada / <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">"Repòs"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
@@ -1010,7 +1102,7 @@
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Mentre es carrega o està connectat a la base"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Els dos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Mentre es carrega"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Connectat a la base"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Acoblat a la base"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Mai"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivat"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Per controlar què passa quan el telèfon està acoblat a una base o en mode de repòs, activa l\'estalvi de pantalla."</string>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"La pantalla s\'activa quan arriben notificacions"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre activat"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostra l\'hora, les icones de notificació i altres dades"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida de la lletra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Amplia o redueix el text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Config. de bloqueig de SIM"</string>
@@ -1196,7 +1299,7 @@
     <string name="storage_detail_images" msgid="6950678857740634769">"Imatges"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"Vídeos"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"Àudio"</string>
-    <string name="storage_detail_cached" msgid="8547136365247818567">"Dades emmagatzemades a la memòria cau"</string>
+    <string name="storage_detail_cached" msgid="8547136365247818567">"Dades desades a la memòria cau"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Altres"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explora <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Esborra la targeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Esborra totes les dades de l\'emmagatzematge USB intern, com ara música o fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Esborra totes les dades de la targeta SD, com ara música o fotos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Esborra les eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Esborra les dades de totes les eSIM del telèfon. No es cancel·larà el teu pla de servei mòbil."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Esborra les dades de totes les eSIM de la tauleta. No es cancel·larà el teu pla de servei mòbil."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restableix la tauleta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restableix el telèfon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vols esborrar tota la informació personal i les aplicacions baixades? Aquesta acció no es pot desfer."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1351,7 +1452,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vols canviar l\'aplicació per a SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vols fer servir <xliff:g id="NEW_APP">%1$s</xliff:g> en lloc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> com a aplicació per als SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vols fer servir <xliff:g id="NEW_APP">%s</xliff:g> com a aplicació per als SMS?"</string>
-    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Proveïdor de valoració de xarxes"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Proveïdor de valoració de la xarxa"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Cap"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Vols canviar l\'assistent de Wi‑Fi?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Confirmes que vols fer servir <xliff:g id="NEW_APP">%1$s</xliff:g>, i no pas <xliff:g id="CURRENT_APP">%2$s</xliff:g>, per gestionar les connexions de la xarxa?"</string>
@@ -1374,9 +1475,9 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Ús de bateria elevat"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Poc ús de bateria"</string>
     <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_high_accuracy_description" msgid="3453010562265338113">"Utilitza el GPS, la Wi-Fi, el Bluetooth o les xarxes de telefonia mòbil per determinar la ubicació"</string>
+    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilitza la Wi‑Fi, el Bluetooth o les xarxes de telefonia mòbil per determinar la ubicació"</string>
+    <string name="location_mode_sensors_only_description" msgid="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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"En execució"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Emmagatzematge USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"A la targeta SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Desactivat"</string>
     <string name="not_installed" msgid="2797554494953450291">"No instal·lada per a l\'usuari"</string>
     <string name="installed" msgid="3070865169422600098">"Instal·lada"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hi ha cap aplicació."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1722,7 +1835,7 @@
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Introducció de text"</string>
     <string name="input_method" msgid="5434026103176856164">"Mètode d\'introducció de text"</string>
     <string name="current_input_method" msgid="2636466029213488159">"Teclat actual"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"Selector del mètode d\'introducció"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Selector del mètode d\'entrada"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automàtic"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostra sempre"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Amaga sempre"</string>
@@ -1794,7 +1907,7 @@
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic quan el punter deixi de moure\'s"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Retard abans del clic"</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">"ACTIVAT"</string>
+    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVADA"</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="daltonizer_type" msgid="1124178250809091080">"Mode de correcció"</string>
@@ -1873,6 +1986,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>
@@ -1910,7 +2027,7 @@
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"L\'aplicació no es pot executar en segon pla"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Ús de la pantalla des de l\'última càrrega completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consum de la pantalla"</string>
-    <string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes mòbils"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes de telefonia mòbil"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Fa <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Ús d\'aplicacions des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ús del dispositiu des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Pantalla"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Llanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Càmera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2208,7 +2368,7 @@
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Escriu la configuració de la xarxa"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Connecta a una xarxa nova"</string>
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"S\'està connectant..."</string>
-    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Ves al pas següent"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Vés al pas següent"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP no és compatible."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"No pots configurar una connexió Wi-Fi EAP durant la configuració. Quan hagi finalitzat, pots dur a terme aquesta acció a Configuració &gt; Sense fil i xarxes."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"La connexió pot trigar una estona..."</string>
@@ -2297,7 +2457,7 @@
     <string name="data_usage_menu_metered" msgid="6235119991372755026">"Restriccions de xarxa"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronització automàtica de dades"</string>
     <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_menu_cellular_networks" msgid="8339835014751511300">"Xarxes de telefonia mòbil"</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_personal" msgid="785541379617346438">"Sincr. dades personals autom."</string>
@@ -2482,7 +2642,7 @@
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restringit"</string>
     <string name="user_need_lock_message" msgid="5879715064416886811">"Per crear un perfil restringit, has de configurar una pantalla de bloqueig per protegir les aplicacions i les dades personals."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Defineix el bloqueig"</string>
-    <string name="user_summary_not_set_up" msgid="8778205026866794909">"No configurat"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"No s\'ha configurat"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"No configurat: perfil restringit"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"El perfil professional no està configurat."</string>
     <string name="user_admin" msgid="993402590002400782">"Administrador"</string>
@@ -2654,17 +2814,20 @@
       <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 de telefonia mòbil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ús de dades"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"punt d\'accés Wi-Fi"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositius connectats"</string>
-    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, emissió, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, emissió"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacions i notificacions"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicacions predeterminades"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Usuaris i comptes"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicacions predeterminades"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomes, hora, còpia de seguretat, actualitzacions"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuració"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Cerca a la configuració"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Cerca a la configuració"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Configuració de la cerca"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Configuració de la cerca"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, connexió de xarxa"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"missatge de text, enviar missatges, missatges, missatgeria"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"telèfon, mòbil, operador de telefonia mòbil, sense fil, dades, 4g, 3g, 2g, lte"</string>
@@ -2702,13 +2865,19 @@
     <string name="keywords_default_apps" msgid="223872637509160136">"aplicacions, predeterminades"</string>
     <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ignorar les optimitzacions, migdiada, aplicacions inactives"</string>
     <string name="keywords_color_mode" msgid="6362744316886077510">"vibrant, RGB, sRGB, color, natural, estàndard"</string>
-    <string name="keywords_color_temperature" msgid="2688947724153266364">"temperatura de color D65 D73 blanc groc blau càlid fred"</string>
+    <string name="keywords_color_temperature" msgid="2688947724153266364">"temperatura del color D65 D73 blanc groc blau càlid fred"</string>
     <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_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>
+    <!-- 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">"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>
@@ -2827,14 +2996,12 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Amb el dispositiu en mode RV"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Redueix el desenfocament (recomanat)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Redueix el parpelleig"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Pantalla en pantalla"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Cap de les aplicacions instal·lades no admet el mode de pantalla en pantalla"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Imatge en imatge"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Cap de les aplicacions instal·lades no admet el mode d\'imatge en imatge"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip imatge en"</string>
-    <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="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imatge en imatge"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permet el mode d\'imatge en imatge"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permet que aquesta aplicació creï una finestra d\'imatge en imatge mentre l\'aplicació està oberta o després de sortir-ne (per exemple, per seguir veient un vídeo). Aquesta finestra es mostra sobre altres aplicacions que estàs utilitzant."</string>
     <string name="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>
@@ -2904,7 +3071,7 @@
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Dies"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Cap"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Cada dia"</string>
-    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"L\'alarma pot anul·lar l\'hora de finalització"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"L\'alarma pot substituir l\'hora de finalització"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Atura quan s\'acabi o quan soni la propera alarma, el que passi primer"</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>
@@ -2957,19 +3124,14 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desactivat"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixació de pantalla"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Si aquesta opció està activada, pots fixar la pantalla per mantenir-la visible fins que deixis de fixar-la.\n\nPer fer-ho:\n\n1. Assegura\'t que la fixació de pantalla estigui activada.\n\n2. Obre la pantalla que vulguis fixar.\n\n3. Toca Aplicacions recents.\n\n4. Llisca cap amunt i toca la icona de fixació."</string>
-    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Sol·licita el patró de desbloqueig per deixar de fixar"</string>
-    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demana el codi PIN per deixar de fixar"</string>
-    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demana la contrasenya per deixar de fixar"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloqueja el dispositiu en deixar de fixar"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Si aquesta opció està activada, pots fixar la pantalla per mantenir-la visible fins que deixis de fixar-la.\n\nPer fer-ho:\n\n1. Assegura\'t que la fixació de pantalla estigui activada.\n\n2. Obre la pantalla que vulguis fixar.\n\n3. Toca Aplicacions recents.\n\n4. Fes lliscar el dit cap amunt i toca la icona de fixació."</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Sol·licita el patró de desbloqueig per anul·lar"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demana el codi PIN per anul·lar"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demana la contrasenya per anul·lar"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloqueja el dispositiu en anul·lar la fixació"</string>
     <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>
@@ -2977,7 +3139,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Per millorar la protecció del dispositiu, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que sol·liciti una contrasenya en iniciar-se?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani un PIN abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un PIN per iniciar-se?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani un patró abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un patró per iniciar-se?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani una contrasenya abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani una contrasenya per iniciar-se?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Per millorar la protecció del dispositiu, a més de fer servir la teva empremta digital per desbloquejar-lo, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nAixò permet protegir les dades en cas de pèrdua o robatori del dispositiu. Vols que sol·liciti una contrasenya en iniciar-se?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vols demanar el PIN?"</string>
@@ -2996,11 +3158,11 @@
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Obre sense demanar-ho"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Enllaços admesos"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Altres valors predeterminats"</string>
-    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilitzats a <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> en ús a <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Emmagatzematge intern"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Emmagatzematge extern"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Ús de dades de l\'aplicació"</string>
-    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> utilitzats des de: <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> d\'ús des de: <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"Emmagatzematge utilitzat"</string>
     <string name="change" msgid="6657848623929839991">"Canvia"</string>
     <string name="change_storage" msgid="600475265207060436">"Canvia l\'emmagatzematge"</string>
@@ -3095,14 +3257,20 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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_on" msgid="6216293998227583810">"No optimitzen la bateria"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimitza l\'ús de la bateria"</string>
     <string name="high_power_system" msgid="7362862974428225301">"L\'optimització de la bateria no està disponible"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"No s\'aplica l\'optimització de la bateria. És possible que es consumeixi més ràpidament."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Vols permetre que l\'aplicació s\'executi sempre en segon pla?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Si permets que <xliff:g id="APP_NAME">%1$s</xliff:g> s\'executi sempre en segon pla, és possible que disminueixi la durada de la bateria. \n\nPots canviar-ho més tard a Configuració &gt; Aplicacions i notificacions."</string>
-    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> utilitzats des de l\'última càrrega completa"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> d\'ús des de l\'última càrrega completa"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Gestió de l\'energia"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Cap ús de la bateria des de l\'última càrrega completa"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Configuració de l\'aplicació"</string>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instal·lar aplicacions desconegudes"</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>
@@ -3200,9 +3369,7 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Permís aplicació per modificar configuració sistema"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Permet modificar la configuració del sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Aquest permís permet que una aplicació modifiqui la configuració del sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
-    <string name="external_source_switch_title" msgid="3621381992793251070">"Permet baixades d\'aquesta font"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Permet d\'aquesta font"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Doble gir per obrir Càmera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira el canell dues vegades per obrir l\'aplicació Càmera"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botó d\'engegada dos cops per obrir càmera"</string>
@@ -3242,7 +3409,7 @@
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Usuari actual: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Sessió iniciada com a <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Aplicació predeterminada: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"ACTIVAT / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"ACTIVADA / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"DESACTIVADA"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Còpia de seguretat desactivada"</string>
     <string name="about_summary" msgid="924181828102801010">"Actualitzat a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
@@ -3264,7 +3431,7 @@
     <string name="condition_hotspot_title" msgid="7778958849468560027">"El punt d\'accés Wi-Fi està activat"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"El punt d\'accés Wi-Fi <xliff:g id="ID_1">%1$s</xliff:g> està activat i la connexió Wi-Fi d\'aquest dispositiu està desactivada."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"El mode d\'avió està activat"</string>
-    <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_airplane_summary" msgid="5561586417832393666">"La Wi-Fi, el Bluetooth i la xarxa de telefonia 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>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automàtica"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Allibera espai ara"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Dreceres gestuals"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos ràpids per controlar el telèfon"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos ràpids per controlar la tauleta"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos ràpids per controlar el dispositiu"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accés ràpid a la càmera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Per obrir ràpidament la càmera, prem el botó d\'engegada dues vegades. Funciona des de qualsevol pantalla."</string>
+    <!-- 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">"Canvia de càmera"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Aixeca el dispositiu per obrir la càmera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Per obrir la càmera automàticament, aixeca el telèfon fins a una posició per fer fotos, en horitzontal o en vertical. Funciona quan el telèfon està inactiu o bloquejat."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fes fotos quan el telèfon estigui inactiu o bloquejat"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gest per obrir Assistència"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilitat"</string>
@@ -3572,9 +3764,10 @@
     <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>
+    <string name="autofill_app" msgid="7338387238377914374">"Servei d\'emplenament automàtic"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automàtic, emplenament, emplenament automàtic"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Assegura\'t que confies en aquesta aplicació&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Emplenament automàtic de Google&gt;%1$s&lt;/xliff:g&gt; utilitza el contingut que es mostra a la pantalla per determinar què es pot emplenar automàticament."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema del dispositiu"</string>
@@ -3585,5 +3778,10 @@
     <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>
+    <!-- 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-cs/arrays.xml b/res/values-cs/arrays.xml
index 76620c8..8ead7f6 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobrý"</item>
     <item msgid="8986346415847956850">"Vynikající"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Vždy"</item>
-    <item msgid="844721238536786870">"Pouze při nabíjení"</item>
-    <item msgid="1986753720941888596">"Nikdy"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Vždy"</item>
-    <item msgid="7433294150916905997">"Pouze při nabíjení"</item>
-    <item msgid="1390404486722375028">"Nikdy"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Posledních 30 dní"</item>
     <item msgid="6600989128423965319">"Zadat cyklus počítání..."</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 26cac3a..3e55225 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odmítnout"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zavřít"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Přepnout"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="few">Ještě <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroky a bude z vás vývojář.</item>
       <item quantity="many">Ještě <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroku a bude z vás vývojář.</item>
@@ -32,6 +31,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 +43,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 +109,26 @@
     <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>
+    <!-- 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">"Nemáte oprávnění měnit nastavení Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +140,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +177,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zařízení"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +356,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 +383,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +493,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 +565,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Změna bezpečnostního gesta"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Změna bezpečnostního kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Změnit bezpečnostní heslo"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Zkuste to znovu. Pokus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Poslední pokus"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Pokud při tomto pokusu zadáte nesprávné gesto pracovního účtu, váš pracovní profil a přidružená data z tohoto zařízení budou odstraněna."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Pokud při tomto pokusu zadáte nesprávný PIN pracovního účtu, váš pracovní profil a přidružená data z tohoto zařízení budou odstraněna."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Pokud při tomto pokusu zadáte nesprávné heslo pracovního účtu, váš pracovní profil a přidružená data z tohoto zařízení budou odstraněna."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Příliš mnoho neplatných pokusů. Váš pracovní profil a přidružená data z tohoto zařízení budou odstraněna."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Zavřít"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Zkuste to znovu. Pokus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaše data budou smazána"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Pokud při příštím pokusu zadáte nesprávné gesto, data v tomto zařízení budou smazána"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Pokud při příštím pokusu zadáte nesprávný PIN, data v tomto zařízení budou smazána"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Pokud při příštím pokusu zadáte nesprávné heslo, data v tomto zařízení budou smazána"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Pokud při příštím pokusu zadáte nesprávné gesto, tento uživatel bude smazán"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Pokud při příštím pokusu zadáte nesprávný PIN, tento uživatel bude smazán"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Pokud při příštím pokusu zadáte nesprávné heslo, tento uživatel bude smazán"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Pokud při příštím pokusu zadáte nesprávné gesto, váš pracovní profil a přidružená data budou smazána"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Pokud při příštím pokusu zadáte nesprávný PIN, váš pracovní profil a přidružená data budou smazána"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Pokud při příštím pokusu zadáte nesprávné heslo, váš pracovní profil a přidružená data budou smazána"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Příliš mnoho neplatných pokusů. Data v tomto zařízení budou smazána."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Příliš mnoho neplatných pokusů. Tento uživatel bude smazán."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Příliš mnoho neplatných pokusů. Tento pracovní profil a přidružená data budou smazána."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Zavřít"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Minimální počet znaků: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Minimální počet čísel kódu PIN: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovat"</string>
@@ -648,6 +696,22 @@
     <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>
+    <!-- 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">"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>
@@ -769,7 +833,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavení zabezpečení bezdrátového směrovače (TKIP) není podporováno"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Chyba ověření. Zkuste to prosím znovu."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Byla zjištěna další relace WPS. Zkuste prosím to znovu za několik minut."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Síť Wi-Fi je odpojena. Nastavování WPS bylo zrušeno."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Název sítě"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Zadejte SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečení"</string>
@@ -834,7 +897,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 +933,28 @@
     <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>
+    <!-- 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_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">"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 +1001,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>
@@ -1004,23 +1086,33 @@
     <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>
+    <!-- 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">"Čas zahájení"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Čas ukončení"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Zapnuto / <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">"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 +1136,19 @@
     <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>
+    <!-- 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">"Probudit obrazovku, když dostanete oznámení"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Vždy zapnuto"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Zobrazovat čas, ikony oznámení a další informace"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Umožňuje zvětšit nebo zmenšit text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku SIM karty"</string>
@@ -1299,6 +1402,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>
@@ -1330,6 +1434,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Smazat kartu SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Smazat všechna data v interním úložišti USB, například hudbu a fotografie."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Smazat všechna data na kartě SD, například hudbu a fotografie."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Vymazat eSIM karty"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Vymazat všechny eSIM karty v telefonu. Tímto krokem nebude zrušen mobilní tarif."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Vymazat všechny eSIM karty v tabletu. Tímto krokem nebude zrušen mobilní tarif."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetovat tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetovat telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Chcete vymazat všechny osobní údaje a stažené aplikace? Tuto akci nelze vrátit zpět."</string>
@@ -1352,26 +1459,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1505,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>
@@ -1519,6 +1620,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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 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>
@@ -1580,6 +1687,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Spuštěné"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Úložiště USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na kartě SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Deaktivováno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Pro tohoto uživ. nenainstal."</string>
     <string name="installed" msgid="3070865169422600098">"Nainstalováno"</string>
     <string name="no_applications" msgid="7336588977497084921">"Žádné aplikace"</string>
@@ -1689,6 +1797,11 @@
     <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>
+    <!-- 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">"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>
@@ -1915,6 +2028,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 +2100,46 @@
     <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>
+    <!-- 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">"Displej"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svítilna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparát"</string>
@@ -1995,7 +2154,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -2047,6 +2207,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2551,7 +2713,7 @@
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Ujistěte se, že je uživatel k dispozici a může si v zařízení nastavit svůj prostor"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nastavit profil?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Nastavit"</string>
-    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Teď ne"</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nyní ne"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Uživatele smí spravovat pouze vlastník tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Uživatele smí spravovat pouze vlastník telefonu."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Pomocí omezených profilů nelze přidávat účty."</string>
@@ -2592,7 +2754,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Platby přiložením telefonu"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Platby dotykem telefonu"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Jak to funguje"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Plaťte v obchodech telefonem"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"Výchozí platební aplikace"</string>
@@ -2601,14 +2763,14 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Použít výchozí"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Vždy"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Kromě případů, kdy je spuštěna jiná platební aplikace"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikace pro platby přiložením telefonu:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikace pro platby dotykem telefonu:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Platba na terminálu"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Nastavte platební aplikaci. Poté jen přidržte telefon zadní stranou u terminálu se symbolem bezkontaktních plateb."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Rozumím"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Další..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Nastavit jako předvolbu?"</string>
-    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Chcete při platbě přiložením telefonu vždy používat aplikaci <xliff:g id="APP">%1$s</xliff:g>?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Chcete při platbě přiložením telefonu namísto aplikace <xliff:g id="APP_0">%1$s</xliff:g> vždy používat aplikaci <xliff:g id="APP_1">%2$s</xliff:g>?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Chcete při platbě dotykem telefonu vždy používat aplikaci <xliff:g id="APP">%1$s</xliff:g>?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Chcete při platbě dotykem telefonu namísto aplikace <xliff:g id="APP_0">%1$s</xliff:g> vždy používat aplikaci <xliff:g id="APP_1">%2$s</xliff:g>?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Omezení"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Odebrat omezení"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"Změnit PIN"</string>
@@ -2706,17 +2868,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Výchozí aplikace"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Jazyky, čas, zálohování, aktualizace"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavení"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Prohledat nastavení"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Prohledat nastavení"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Nastavení vyhledávání"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Vyhledávání nastavení"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, síť, připojení"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"textová zpráva, posílání SMS, zprávy, odesílání zpráv"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilní síť, mobilní operátor, mobilní data, bezdrátové, data, 4g, 3g, 2g, lte"</string>
@@ -2761,6 +2926,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"platit, klepnout, platby"</string>
     <string name="keywords_backup" msgid="470070289135403022">"záloha, zálohování"</string>
+    <!-- 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">"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>
@@ -2832,7 +3003,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Oznámení"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Rozšířená nastavení"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Pracovní oznámení"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"Povolit puntíky s oznámením"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Povolit puntíky s oznámeními"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blikání kontrolky"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na obrazovce uzamčení"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazit veškerý obsah oznámení"</string>
@@ -2884,13 +3055,11 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Snížit rozmazání (doporučeno)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Snížit mihotání"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Obraz v obraze"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Žádná nainstalovaná aplikace nepodporuje režim obraz v obraze"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Žádná nainstalovaná aplikace nepodporuje režim Obraz v obraze"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"obraz v obraze"</string>
     <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="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Povolí této aplikaci vytvořit okno obrazu v obrazu, když je otevřená, nebo poté, co ji opustíte (například abyste mohli pokračovat ve sledování videa). Toto okno se zobrazuje nad ostatními aplikacemi, které používáte."</string>
     <string name="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>
@@ -3029,11 +3198,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 +3205,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>
@@ -3055,7 +3219,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Informace související s kódem IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Otevírat ve výchozím nastavení"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Otevírání odkazů"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Odkazy na otevření"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Otevírání podporovaných odkazů"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Otevírat bez dotazu"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Podporované odkazy"</string>
@@ -3105,7 +3269,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Osobní"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Práce"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikace: Vše"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikace: vypnuto"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikace: Vypnuto"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorie: Urgentní důležitost"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorie: Nízká důležitost"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorie: Vypnuto"</string>
@@ -3117,7 +3281,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikace, které používají oprávnění <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Probudit klepnutím"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Dvojitým klepnutím kamkoli na obrazovku zařízení probudíte"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Otevírání odkazů"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Odkazy na otevření"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Neotevírat podporované odkazy"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Otevírat adresy z domény <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Otevřít doménu <xliff:g id="DOMAIN">%s</xliff:g> a další adresy URL"</string>
@@ -3167,6 +3331,14 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozornění na využití"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Zobrazit úplné využití zařízení"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Zobrazit využití aplikace"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Vysoké využití"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikace se chovají neobvykle</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> aplikace se chová neobvykle</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikací se chová neobvykle</item>
+      <item quantity="one">Aplikace <xliff:g id="APP">%1$s</xliff:g> se chová neobvykle</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3433,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalace neznámých aplikací"</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>
@@ -3274,8 +3447,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Oprávnění aplikace ke změnám nastavení systému"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Povolit provádění změn nastavení systému"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Toto oprávnění umožňuje aplikaci měnit nastavení systému."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ano"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Povolit z tohoto zdroje"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Otevření Fotoaparátu otočením zápěstí"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Umožňuje otevřít aplikaci Fotoaparát dvojitým otočením zápěstí."</string>
@@ -3372,8 +3543,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 +3567,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>
@@ -3464,7 +3634,6 @@
     <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="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>
@@ -3535,28 +3704,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaticky"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ruční"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Uvolnit místo"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesta"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Akce prováděné gesty"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Rychlá gesta k ovládání telefonu"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Rychlá gesta k ovládání tabletu"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Rychlá gesta k ovládání zařízení"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Spuštění fotoaparátu"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Chcete-li rychle spustit fotoaparát, dvakrát stiskněte vypínač. Funguje to na všech obrazovkách."</string>
+    <!-- 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">"Přepnutí fotoaparátu"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Otevřít fotoaparát, když zvednete zařízení"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Chcete-li automaticky spustit fotoaparát, zvedněte telefon do polohy pro focení (na výšku nebo na šířku). Funguje, i když je telefon v režimu spánku nebo uzamčený."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Foťte, i když je telefon v režimu spánku nebo uzamčený"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto asistence"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Citlivost"</string>
@@ -3674,6 +3870,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 +3884,10 @@
     <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>
+    <!-- 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-da/arrays.xml b/res/values-da/arrays.xml
index e939775..c54b814 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"God"</item>
     <item msgid="8986346415847956850">"Fremragende"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Altid"</item>
-    <item msgid="844721238536786870">"Kun når tilsluttet strøm"</item>
-    <item msgid="1986753720941888596">"Aldrig"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Altid"</item>
-    <item msgid="7433294150916905997">"Kun når tilsluttet strøm"</item>
-    <item msgid="1390404486722375028">"Aldrig"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"De seneste 30 dage"</item>
     <item msgid="6600989128423965319">"Angiv cyklus for brug..."</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fbbd315..3d47aae 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Afvis"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Luk"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Skift"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Ukendt"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Du er nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skridt fra at være udvikler.</item>
       <item quantity="other">Du er nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skridt fra at være udvikler.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Du har ikke tilladelse til at ændre Bluetooth-indstillinger."</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> er synlig for enheder i nærheden, når Bluetooth-indstillingerne er åbne."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dine enheder"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Skift oplåsningsmønster"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Skift pinkode til oplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Skift adgangskode til oplåsning"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Prøv igen. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. forsøg ud af <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Sidste forsøg"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Hvis du indtaster et forkert mønster til din arbejdsprofil i dette forsøg, fjernes din profil og de tilhørende data fra denne enhed."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Hvis du indtaster en forkert pinkode til din arbejdsprofil i dette forsøg, fjernes din profil og de tilhørende data fra denne enhed."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Hvis du indtaster en forkert adgangskode til din arbejdsprofil i dette forsøg, fjernes din profil og de tilhørende data fra denne enhed."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"For mange forkerte forsøg. Din arbejdsprofil og de tilhørende data fjernes fra denne enhed."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Luk"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Prøv igen. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. forsøg ud af <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Dine data bliver slettet"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Hvis du angiver et forkert mønster i næste forsøg, slettes dataene på denne enhed"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Hvis du angiver et forkert pinkode i næste forsøg, slettes dataene på denne enhed"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Hvis du angiver en forkert adgangskode i næste forsøg, slettes dataene på denne enhed"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Hvis du angiver et forkert mønster i næste forsøg, slettes denne bruger"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Hvis du angiver en forkert pinkode i næste forsøg, slettes denne bruger"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Hvis du angiver en forkert adgangskode i næste forsøg, slettes denne bruger"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Hvis du angiver et forkert mønster i næste forsøg, slettes din arbejdsprofil og de tilhørende data"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Hvis du angiver et forkert pinkode i næste forsøg, slettes din arbejdsprofil og de tilhørende data"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Hvis du angiver en forkert adgangskode i næste forsøg, slettes din arbejdsprofil og de tilhørende data"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"For mange forkerte forsøg. Dataene på denne enhed slettes."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"For mange forkerte forsøg. Denne bruger slettes."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"For mange forkerte forsøg. Denne arbejdsprofil og de tilhørende data slettes."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Luk"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Skal være på mindst <xliff:g id="COUNT">%d</xliff:g> tegn"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Pinkoden skal være på mindst <xliff:g id="COUNT">%d</xliff:g> cifre"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsæt"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhedsindstillingen til trådløse routere (TKIP) understøttes ikke"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Godkendelsesfejl. Prøv igen."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En anden WPS-session blev registreret. Prøv igen om et par minutter."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi-Fi-forbindelsen blev afbrudt. Konfigurationen af WPS blev annulleret."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Netværksnavn"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Indtast SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhed"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Starttidspunkt"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Sluttidspunkt"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Til/<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">"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>
@@ -1007,7 +1099,7 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Tilpas din skærm"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vælg baggrund fra"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Pauseskærm"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Under opladning, eller når enheden er sluttet til en dockingstation"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Under opladning, eller når enheden er sluttet til dockingstationen"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Begge dele"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under opladning"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheden er tilsluttet en dockingstation"</string>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"Væk skærmen, når du modtager underretninger"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Altid aktiveret"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vis klokkeslæt, underretningsikoner og andre oplysninger"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for låst SIM-kort"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Formatér SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Slet alle data på det interne USB-lager, f.eks. musik eller billeder"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Formatér alle data på SD-kortet, f.eks. musik eller billeder"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Slet eSIM-kort"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Slet alle eSIM-kort på telefonen. Det medfører ikke, at dit mobilabonnement opsiges."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Slet alle eSIM-kort på din tablet. Det medfører ikke, at dit mobilabonnement opsiges."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Nulstil tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Nulstil telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vil du slette alle dine personlige oplysninger og downloadede apps? Du kan ikke fortryde denne handling."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Kørende"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lager"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
+    <string name="disabled" msgid="9206776641295849915">"Deaktiveret"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ikke installeret for denne bruger"</string>
     <string name="installed" msgid="3070865169422600098">"Installeret"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ingen apps."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Skærm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lommelygte"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2160,7 +2320,7 @@
     <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>
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Vil du stoppe med at sikkerhedskopiere enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, som apps har gemt) og slette alle kopier på fjernservere?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"Foretag automatisk ekstern backup af enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, der er gemt i apps).\n\n Når du slår automatisk backup til, gemmes enheds- og appdata med jævne mellemrum eksternt. Appdata kan være alle former for data, som en app har gemt (afhængigt af udviklerens indstillinger), f.eks. potentielt følsomme data, såsom kontaktpersoner, beskeder og billeder."</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"Foretag automatisk ekstern sikkerhedskopiering af enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, der er gemt i apps).\n\n Når du slår automatisk sikkerhedskopiering til, gemmes enheds- og appdata med jævne mellemrum eksternt. Appdata kan være alle former for data, som en app har gemt (afhængigt af udviklerens indstillinger), f.eks. potentielt følsomme data, såsom kontaktpersoner, beskeder og billeder."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"Indstillinger for enhedsadministrator"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"App til enhedsadministration"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"Deaktiver denne app til enhedsadministration"</string>
@@ -2386,10 +2546,10 @@
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(ingen bekræftelse af serveren)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(modtaget fra serveren)"</string>
     <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"Denne VPN-type kan ikke være forbundet hele tiden"</string>
-    <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"Konstant VPN understøtter kun numeriske serveradresser"</string>
-    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"Der skal angives en DNS-server for konstant VPN"</string>
+    <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"Altid aktiveret VPN understøtter kun numeriske serveradresser"</string>
+    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"Der skal angives en DNS-server for altid aktiveret VPN"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"DNS-serveradressen skal være numerisk for altid aktiverede VPN-netværk"</string>
-    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"De indtastede oplysninger understøtter ikke konstant VPN"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"De indtastede oplysninger understøtter ikke altid aktiveret VPN"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Annuller"</string>
     <string name="vpn_done" msgid="8678655203910995914">"Annuller"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Gem"</string>
@@ -2403,19 +2563,19 @@
     <string name="vpn_version" msgid="1939804054179766249">"Version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Glem VPN"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Erstat det eksisterende VPN-netværk?"</string>
-    <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Vil du konfigurere konstant VPN?"</string>
+    <string name="vpn_set_vpn_title" msgid="4009987321156037267">"Vil du konfigurere altid aktiveret VPN?"</string>
     <string name="vpn_first_always_on_vpn_message" msgid="3025322109743675467">"Hvis du aktiverer denne indstilling, vil du ikke have nogen internetforbindelse, før VPN-netværket etablerer forbindelse."</string>
     <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"Dit eksisterende VPN-netværk erstattes, og du vil ikke have nogen internetforbindelse, før VPN-netværket etablerer forbindelse."</string>
-    <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"Du har allerede forbindelse til et konstant VPN-netværk. Hvis du opretter forbindelse til et andet netværk, erstattes dit eksisterende VPN, og Altid aktiveret-tilstanden deaktiveres."</string>
+    <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"Du har allerede forbindelse til et altid aktiveret VPN-netværk. Hvis du opretter forbindelse til et andet netværk, erstattes dit eksisterende VPN, og Altid aktiveret-tilstanden deaktiveres."</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"Du har allerede forbindelse til et VPN-netværk. Hvis du opretter forbindelse til et andet, erstattes dit eksisterende VPN."</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"Aktivér"</string>
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> kan ikke oprette forbindelse"</string>
-    <string name="vpn_cant_connect_message" msgid="1352832123114214283">"Denne app understøtter ikke konstant VPN"</string>
+    <string name="vpn_cant_connect_message" msgid="1352832123114214283">"Denne app understøtter ikke altid aktiveret VPN"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Tilføj VPN-profil"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Rediger profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Slet profil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Konstant VPN"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Altid aktiveret VPN"</string>
     <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Der er ikke tilføjet nogen VPN-netværk"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"Vær forbundet til VPN hele tiden"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Understøttes ikke af denne app"</string>
@@ -2424,7 +2584,7 @@
     <string name="vpn_require_connection_title" msgid="159053539340576331">"Vil du kræve VPN-forbindelse?"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vælg en VPN-profil, der altid skal være forbindelse til. Netværkstrafik tillades kun, når der er forbindelse til dette VPN-netværk."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ingen"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Et konstant VPN kræver en IP-adresse til både server og DNS."</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Et altid aktiveret VPN kræver en IP-adresse til både server og DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Der er ingen netværksforbindelse. Prøv igen senere."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"Frakoblet VPN"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"Ingen"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Standardapps"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Sprog, tid, sikkerhedskopiering, opdateringer"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Indstillinger"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Søg indstillinger"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Søg indstillinger"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Søgeindstillinger"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Indstillinger for søgning"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, netværksforbindelse"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"sms, sende sms-beskeder, beskeder, chat"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobil, mobilselskab, trådløs, data, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"bevægelse"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betal, tryk, betalinger"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sikkerhedskopiering, sikkerhedskopiér"</string>
+    <!-- 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">"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>
@@ -2722,7 +2891,7 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringesignalet er indstillet til vibration"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringesignalet er indstillet til lydløs"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Lydstyrken for ringetonen er på 80 %"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Lydstyrke for medier"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Medielydstyrke"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Lydstyrke for alarmer"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Lydstyrke for ringetone"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Lydstyrke for underretninger"</string>
@@ -2734,8 +2903,8 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer også ved opkald"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andre lyde"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toner for numerisk tastatur"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Lyd ved skærmlås"</string>
-    <string name="charging_sounds_title" msgid="1132272552057504251">"Lyd ved opladning"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Lyde for skærmlås"</string>
+    <string name="charging_sounds_title" msgid="1132272552057504251">"Opladningslyde"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Lyde for dockingstation"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Lyd ved berøring"</string>
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Vibrer ved tryk"</string>
@@ -2752,7 +2921,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatiske regler er slået til</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Præferencer for Forstyr ikke"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Kun prioritet tillader"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritet tillader kun"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatiske regler"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Angiv regler for Forstyr ikke"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Begræns lyde og vibrationer på bestemte tidspunkter"</string>
@@ -2833,8 +3002,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>
@@ -2862,7 +3029,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"Tillad underretningscirkel"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Vis underretningscirkel"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Tilsidesæt Forstyr ikke"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lad disse underretninger fortsætte med at afbryde, når Forstyr ikke er konfigureret som Kun prioritet"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lad disse underretninger fortsætte med at afbryde, når Forstyr ikke er slået til med angivelsen Kun prioritet"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låseskærmen"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeret"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
@@ -2889,8 +3056,8 @@
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Der er oprettet en automatisk regel om at aktivere \"Forstyr ikke\" på bestemte tidspunkter"</string>
     <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Regel for begivenheder"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"En automatisk regel er indstillet til at slå \"Forstyr ikke\" til ved bestemte begivenheder"</string>
-    <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Under begivenheder fra"</string>
-    <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Under begivenheder fra <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Under begivenheder for"</string>
+    <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Under begivenheder for <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"enhver kalender"</string>
     <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Hvor svaret er <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Enhver kalender"</string>
@@ -2965,11 +3132,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Denne arbejdsprofil administreres af:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administreret af <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentel)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Enhedsrotation"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Roter skærmindholdet"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Bliv i stående format"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Behold liggende format"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Behold den aktuelle orientering"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sikker opstart"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsæt"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kan beskytte denne enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før enheden kan starte op?"</string>
@@ -2977,7 +3139,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kan beskytte denne enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før din enhed kan starte op?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Ud over at kræve fingeraftryk til oplåsning kan du beskytte din enhed yderligere ved at kræve, at din adgangskode angives før opstart. Enheden kan ikke modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet op.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nej"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Kræv pinkode?"</string>
@@ -3095,6 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Installer ukendte apps"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Apptilladelse til at ændre systemindstillinger"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Tillad ændring af systemindstillinger"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Denne tilladelse giver en app lov til at ændre systemindstillinger."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Tillad fra denne kilde"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Drej to gange for at åbne kameraet"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Åbn kameraappen ved at dreje håndleddet to gange"</string>
@@ -3296,8 +3463,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Dataadvarsel ved <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Dataadvarsel ved <xliff:g id="ID_1">%1$s</xliff:g> / Datagrænse på <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringscyklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Den månedlige cyklus starter den <xliff:g id="ID_1">%1$s</xliff:g>. i hver måned"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hver måned fra og med den <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Den <xliff:g id="ID_1">%1$s</xliff:g>. i hver måned"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Netværksbegrænsninger"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> begrænsning</item>
@@ -3317,7 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisk"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Frigør plads nu"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Bevægelser"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Genveje til bevægelser"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Styr din telefon med hurtige bevægelser"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Styr din tablet med hurtige bevægelser"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Styr din enhed med hurtige bevægelser"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Gå til kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Du kan åbne dit kamera hurtigt ved at trykke to gange på afbryderknappen. Denne genvej fungerer fra enhver skærm."</string>
+    <!-- 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">"Vip kameraet"</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">"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>
+    <!-- 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">"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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Stryg over fingeraftrykslæser for at se underretninger"</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">"Stryg over fingeraftryk for at se underretninger"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af telefonen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af din tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af enheden."</string>
+    <!-- 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">"Hold telefonen op foran dig for at åbne kameraet"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kameraet åbnes automatisk, når du holder din telefon op foran dig i billedtagningsposition (enten i liggende eller stående format). Funktionen virker også, selvom din telefon er inaktiv eller låst."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tag billeder, mens telefonen er i dvale eller låst"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Forslagsbevægelse"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Følsomhed"</string>
@@ -3522,9 +3714,9 @@
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Standardtastatur"</string>
     <string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"Indstillet til <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
-    <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"\"Konstant VPN\" er aktiveret"</string>
-    <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"\"Konstant VPN\" er aktiveret på din personlige profil"</string>
-    <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"\"Konstant VPN\" er aktiveret på din arbejdsprofil"</string>
+    <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"\"Altid aktiveret VPN\" er aktiveret"</string>
+    <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"\"Altid aktiveret VPN\" er aktiveret på din personlige profil"</string>
+    <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"\"Altid aktiveret VPN\" er aktiveret på din arbejdsprofil"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Global HTTP-proxy er konfigureret"</string>
     <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pålidelige loginoplysninger"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
@@ -3572,6 +3764,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 +3778,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant app"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Slå lagerstyring fra?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- og tv-apps"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Anvendt lagerplads"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Oplysninger om mobilselskab"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Udløs mobilselskab"</string>
+    <!-- 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-de/arrays.xml b/res/values-de/arrays.xml
index aa90ce5..40c8029 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Gut"</item>
     <item msgid="8986346415847956850">"Sehr gut"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Immer"</item>
-    <item msgid="844721238536786870">"Nur wenn angeschlossen"</item>
-    <item msgid="1986753720941888596">"Nie"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Immer"</item>
-    <item msgid="7433294150916905997">"Nur wenn angeschlossen"</item>
-    <item msgid="1390404486722375028">"Nie"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Letzte 30 Tage"</item>
     <item msgid="6600989128423965319">"Nutzungszyklus wählen…"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 747b389..9aa8323 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Ablehnen"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Schließen"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Wechseln"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">In <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> Schritten bist du Entwickler.</item>
       <item quantity="one">In <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> Schritt bist du Entwickler.</item>
     </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 +41,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 +106,26 @@
     <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>
+    <!-- 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">"Du bist nicht zur Änderung der Bluetooth-Einstellungen berechtigt."</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> ist bei aktiviertem Bluetooth für Geräte in der Nähe sichtbar."</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">"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 +137,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +174,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Meine Geräte"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +351,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 +376,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +486,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 +558,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Entsperrungsmuster ändern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Entsperrungs-PIN ändern"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Entsperrungspasswort ändern"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Bitte versuche es noch einmal. Versuch <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> von <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Letzter Versuch"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Wenn du bei diesem Anmeldeversuch ein falsches Muster eingibst, werden dein Arbeitsprofil und damit verknüpfte Daten von diesem Gerät entfernt."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Wenn du bei diesem Anmeldeversuch eine falsche PIN eingibst, werden dein Arbeitsprofil und damit verknüpfte Daten von diesem Gerät entfernt."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Wenn du bei diesem Anmeldeversuch ein falsches Passwort eingibst, werden dein Arbeitsprofil und damit verknüpfte Daten von diesem Gerät entfernt."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Zu viele Fehlversuche. Dein Arbeitsprofil und damit verknüpfte Daten werden von diesem Gerät entfernt."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Schließen"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Bitte versuche es noch einmal. Versuch <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> von <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Deine Daten werden gelöscht"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Wenn du beim nächsten Versuch ein falsches Muster eingibst, werden die Daten auf diesem Gerät gelöscht"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Wenn du beim nächsten Versuch eine falsche PIN eingibst, werden die Daten auf diesem Gerät gelöscht"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Wenn du beim nächsten Versuch ein falsches Passwort eingibst, werden die Daten auf diesem Gerät gelöscht"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Wenn du beim nächsten Versuch ein falsches Muster eingibst, wird dieser Nutzer von dem Gerät entfernt"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Wenn du beim nächsten Versuch eine falsche PIN eingibst, wird dieser Nutzer von dem Gerät entfernt"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Wenn du beim nächsten Versuch ein falsches Passwort eingibst, wird dieser Nutzer von dem Gerät entfernt"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Wenn du beim nächsten Versuch ein falsches Muster eingibst, werden dein Arbeitsprofil und die zugehörigen Daten gelöscht"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Wenn du beim nächsten Versuch eine falsche PIN eingibst, werden dein Arbeitsprofil und die zugehörigen Daten gelöscht"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Wenn du beim nächsten Versuch ein falsches Passwort eingibst, werden dein Arbeitsprofil und die zugehörigen Daten gelöscht"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Zu viele Fehlversuche. Die Daten auf diesem Gerät werden gelöscht."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Zu viele Fehlversuche. Dieser Nutzer wird von dem Gerät entfernt."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Zu viele Fehlversuche. Dieses Arbeitsprofil und die zugehörigen Daten werden gelöscht."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Schließen"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Das Passwort muss mindestens <xliff:g id="COUNT">%d</xliff:g> Zeichen umfassen"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Die PIN muss mindestens <xliff:g id="COUNT">%d</xliff:g> Ziffern umfassen"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Weiter"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -714,7 +778,7 @@
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"WLAN-Einstellungen"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"WLAN wird automatisch wieder aktiviert"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"WLAN wird nicht automatisch wieder aktiviert"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"WLANs"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"WLAN-Netzwerke"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-Push-Taste"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Weitere Optionen"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN-Eingabe"</string>
@@ -740,14 +804,13 @@
     <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Wähle die Schaltfläche \"Wi-Fi Protected Setup\" auf deinem Router aus. Eventuell lautet sie auch \"WPS\" oder ist mit diesem Symbol gekennzeichnet:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Gib die PIN <xliff:g id="NUMBER">%1$s</xliff:g> auf deinem WLAN-Router ein. Die Einrichtung kann bis zu 2 Minuten dauern."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS erfolgreich. Netzwerkverbindung wird hergestellt…"</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"Mit WLAN <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS wird bereits durchgeführt. Dieser Vorgang kann bis zu 2 Minuten dauern."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS fehlgeschlagen. Bitte versuche es in einigen Minuten erneut."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Die Sicherheitseinstellung für drahtlose Router (WEP) wird nicht unterstützt."</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die Sicherheitseinstellung für drahtlose Router (TKIP) wird nicht unterstützt."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentifizierungsfehler. Bitte versuche es erneut."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Es wurde eine andere WPS-Sitzung gefunden. Bitte versuche es in einigen Minuten erneut."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Keine WLAN-Verbindung. WPS-Einrichtung abgebrochen."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Netzwerkname"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID eingeben"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicherheit"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"Hotspot wird aktiviert…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot wird deaktiviert…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ist aktiviert"</string>
@@ -895,7 +976,8 @@
     <item msgid="2339246858001475047">"2"</item>
     <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" msgid="2597566001655908391">"Wenn die Option \"Anrufe über WLAN\" aktiviert ist, kann dein Smartphone abhängig von deiner Einstellung und von der Signalstärke Anrufe über WLAN-Netzwerke oder über das Netz deines Mobilfunkanbieters übertragen. Erkundige dich bei deinem Mobilfunkanbieter über die hierfür erhobenen Gebühren und andere Informationen, bevor du diese Funktion aktivierst."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Notfalladresse aktualisieren"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresse, die bei einem Notruf über WLAN von Notdiensten als dein Standort verwendet wird"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Beginn"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ende"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"An / <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">"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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"Bei Benachrichtigungen Bildschirm aktivieren"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Immer aktiviert"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Uhrzeit, Benachrichtigungssymbole und andere Informationen anzeigen"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Text vergrößern oder verkleinern"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Einstellungen für SIM-Sperre"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-Karte löschen"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher löschen"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs löschen"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Alle eSIMs auf dem Smartphone werden gelöscht. Dein Mobilfunktarif wird dadurch nicht gekündigt."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Alle eSIMs auf dem Tablet werden gelöscht. Dein Mobilfunktarif wird dadurch nicht gekündigt."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet zurücksetzen"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon zurücksetzen"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Alle personenbezogenen Daten und heruntergeladenen Apps löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1403,7 +1504,7 @@
     <string name="legal_information" msgid="5769301644270604095">"Rechtliche Hinweise"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mitwirkende"</string>
     <string name="manual" msgid="3025943393642974445">"Handbuch"</string>
-    <string name="regulatory_labels" msgid="1293050314122427492">"Zulassungszeichen"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Regulierungslabels"</string>
     <string name="safety_and_regulatory_info" msgid="5103161279848427185">"Sicherheits- &amp; Regulierungsinformationen"</string>
     <string name="copyright_title" msgid="865906688917260647">"Urheberrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizenz"</string>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Aktiv"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-Speicher"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Auf SD-Karte"</string>
+    <string name="disabled" msgid="9206776641295849915">"Deaktiviert"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nicht für Nutzer installiert"</string>
     <string name="installed" msgid="3070865169422600098">"Installiert"</string>
     <string name="no_applications" msgid="7336588977497084921">"Keine Apps"</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"Sprachen &amp; Eingabe"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Sprachen &amp; Eingabe"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Eingabehilfen"</string>
@@ -1739,13 +1852,13 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget erstellen und Zugriff erlauben?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Nach der Erstellung des Widgets hat <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> Zugriff auf alle von ihm angezeigten Daten."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> immer das Erstellen von Widgets und den Zugriff auf ihre Daten erlauben"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> T <xliff:g id="HOURS">%2$d</xliff:g> Std. <xliff:g id="MINUTES">%3$d</xliff:g> Min. <xliff:g id="SECONDS">%4$d</xliff:g> Sek."</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> Std. <xliff:g id="MINUTES">%2$d</xliff:g> Min. <xliff:g id="SECONDS">%3$d</xliff:g> Sek."</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> Sek."</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> Sek."</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> T <xliff:g id="HOURS">%2$d</xliff:g> Std. <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> Std. <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="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> 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">"Nutzungsstatistik"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Nutzungsstatistik"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Sortieren nach:"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Display"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Taschenlampe"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2186,9 +2346,9 @@
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Klingelton &amp; Vibration für Anrufe"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"System"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"WLAN-Einrichtung"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Mit WLAN verbinden: <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Verbindung mit WLAN <xliff:g id="NETWORK_NAME">%s</xliff:g> wird hergestellt…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Mit WLAN <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Mit WLAN-Netzwerk verbinden: <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Verbindung mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> wird hergestellt…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Netzwerk hinzufügen"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nicht verbunden"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Netzwerk hinzufügen"</string>
@@ -2360,7 +2520,7 @@
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Netzwerkbeschränkungen"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Kostenpflichtige Netzwerke werden wie Mobilfunknetze behandelt, wenn die Hintergrunddaten eingeschränkt wurden. In Apps werden möglicherweise Warnungen angezeigt, bevor große Datenmengen über diese Netzwerke heruntergeladen werden."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilfunknetze"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Kostenpflichtige WLANs"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Kostenpflichtige WLAN-Netzwerke"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Um kostenpflichtige Netzwerke auszuwählen, aktiviere WLAN."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Notruf"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Standard-Apps"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Sprachen, Zeit, Sicherung und Updates"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Einstellungen"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Einstellungen durchsuchen"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Einstellungen durchsuchen"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Sucheinstellungen"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Sucheinstellungen"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wlan, netzwerkverbindung"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"textnachricht, sms, sms schicken, sms senden, nachrichten, mms"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilfunk, mobil, mobilfunkanbieter, kabellos, drahtlos, daten, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"Bewegung"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"Bezahlen, tippen, Zahlungen"</string>
     <string name="keywords_backup" msgid="470070289135403022">"Sicherung, sicherung"</string>
+    <!-- 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">"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>
@@ -2730,7 +2899,7 @@
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Standard-Benachrichtigungston"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Von App erzeugter Ton"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"Standard-Benachrichtigungston"</string>
-    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standard-Weckton"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standard-Weckerton"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Bei Anrufen auch vibrieren"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andere Töne"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Wähltastentöne"</string>
@@ -2779,7 +2948,7 @@
     <string name="advanced_section_header" msgid="8833934850242546903">"Erweitert"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Geschäftliche Benachrichtigungen"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Benachrichtigungspunkte erlauben"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"Licht blinken lassen"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Blinklicht"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Auf dem Sperrbildschirm"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Gesamten Benachrichtigungsinhalt anzeigen"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Vertrauliche Benachrichtigungsinhalte ausblenden"</string>
@@ -2827,14 +2996,12 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Wenn das Gerät im VR-Modus ist"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Unschärfe reduzieren (empfohlen)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Flimmern reduzieren"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Bild im Bild"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Keine der installierten Apps unterstützt den Bild-im-Bild-Modus"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Bild-in-Bild"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Keine der installierten Apps unterstützt den Bild-in-Bild-Modus"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"bib, bild in bild, bild, in"</string>
-    <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_title" msgid="4080800421316791732">"Bild-in-Bild"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Bild-in-Bild zulassen"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Während die App geöffnet ist oder nachdem du sie verlässt (z. B. um ein Video weiter anzusehen) öffnet die App ein Bild-im-Bild-Fenster. Das Fenster wird über anderen Apps eingeblendet, die du gerade verwendest."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Ja"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Nein"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Zugriff während \"Nicht stören\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Keine installierte App hat während \"Nicht stören\" Zugriff angefordert."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
@@ -2859,17 +3026,17 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Diese Benachrichtigungen niemals anzeigen"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Benachrichtigungen anzeigen"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen niemals in der Leiste oder auf Peripheriegeräten anzeigen"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"App-Benachrichtigungspunkt erlauben"</string>
-    <string name="notification_channel_badge_title" msgid="2240827899882847087">"App-Benachrichtigungspunkt anzeigen"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"Benachrichtigungspunkt erlauben"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Benachrichtigungspunkt anzeigen"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Diese Benachrichtigungen dürfen auch dann gemeldet werden, wenn für den Modus \"Nicht stören\" die Option \"Nur wichtige Unterbrechungen\" ausgewählt ist"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Diese Benachrichtigungen dürfen auch dann empfangen werden, wenn für den Modus \"Nicht stören\" die Option \"Nur wichtige Unterbrechungen\" ausgewählt ist."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Auf dem Sperrbildschirm"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blockiert"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Wichtig"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensibel"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fertig"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Wichtigkeit"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"Licht blinken lassen"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Blinklicht"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibrieren"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"Ton"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Löschen"</string>
@@ -2913,7 +3080,7 @@
     <string name="zen_mode_messages" msgid="5886440273537510894">"Nachrichten"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Alle Nachrichten"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Ausgewählte Nachrichten"</string>
-    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Von allen"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Von beliebiger Person"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Nur von Kontakten"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Nur von markierten Kontakten"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Keine"</string>
@@ -2965,11 +3132,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 +3139,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,13 +3257,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Akkuwarnung"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Vollständige Gerätenutzung zeigen"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"App-Nutzung zeigen"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Häufig verwendet"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> Apps funktionieren nicht wie gewohnt</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> funktioniert nicht wie gewohnt</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
     <string name="high_power_system" msgid="7362862974428225301">"Akku-Optimierung nicht verfügbar"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Keine Optimierung bezüglich der Akkuleistung anwenden. Dein Akku entleert sich hierdurch möglicherweise schneller."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Soll die App immer im Hintergrund ausgeführt werden?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"Wenn du erlaubst, dass \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" dauerhaft im Hintergrund ausgeführt wird, kann dies die  Akkulaufzeit verringern. \n\nDu kannst diese Einstellung jederzeit unter \"Einstellungen\" &gt; \"Apps &amp; Benachrichtigungen\" ändern."</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Wenn du \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" erlaubst, stets im Hintergrund ausgeführt zu werden, kann dies die  Akkulaufzeit verringern. \n\nDu kannst dies später unter \"Einstellungen\" &gt; \"Apps &amp; Benachrichtigungen\" ändern."</string>
     <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> Verbrauch seit der letzten vollständigen Aufladung"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Energiespareinstellungen"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Kein Verbrauch seit dem letzten vollen Aufladen"</string>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Unbek. Apps installieren"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Änderungsberechtigung für Systemeinstellungen"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Änderung von Systemeinstellungen zulassen"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Diese Berechtigung ermöglicht einer App das Ändern von Systemeinstellungen."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nein"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Dieser Quelle vertrauen"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Zum Öffnen der Kamera zweimal drehen"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Kamera App durch zweimaliges Drehen des Handgelenks öffnen"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisch"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuell"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Jetzt Speicherplatz freigeben"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Bewegungen"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Bewegungskombinationen"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Schnelle Gesten zum Steuern deines Smartphones"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Schnelle Gesten zum Steuern deines Tablets"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Schnelle Gesten zum Steuern deines Geräts"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Zur Kamera wechseln"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Starte die Kamera direkt, indem du die Ein-/Aus-Taste zweimal drückst. Dies funktioniert auf jedem Display."</string>
+    <!-- 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">"Kamera wechseln"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Smartphones über den Fingerabdrucksensor nach unten wischst."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Tablets über den Fingerabdrucksensor nach unten wischst."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Geräts über den Fingerabdrucksensor nach unten wischst."</string>
+    <!-- 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">"Smartphone hochnehmen, um die Kamera zu öffnen"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Wenn du dein Smartphone hochhebst und es zum Fotografieren im Hoch- oder Querformat hältst, öffnet sich die Kamera automatisch. Dies funktioniert, wenn das Gerät im Ruhemodus oder gesperrt ist."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotos machen, wenn das Gerät im Ruhemodus oder gesperrt ist"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistent-Bewegung"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Empfindlichkeit"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-el/arrays.xml b/res/values-el/arrays.xml
index ab8d05b..6e1ba8b 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Καλό"</item>
     <item msgid="8986346415847956850">"Εξαιρετικό"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Πάντα"</item>
-    <item msgid="844721238536786870">"Μόνο όταν είναι συνδεδεμένο"</item>
-    <item msgid="1986753720941888596">"Ποτέ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Πάντα"</item>
-    <item msgid="7433294150916905997">"Μόνο όταν είναι συνδεδεμένο"</item>
-    <item msgid="1390404486722375028">"Ποτέ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 τελευταίες ημέρες"</item>
     <item msgid="6600989128423965319">"Ορισμός κύκλου χρήσης…"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index acecbe7..572cf5c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -23,13 +23,13 @@
     <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="other">Απομένουν <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής.</item>
       <item quantity="one">Απομένει<xliff:g id="STEP_COUNT_0">%1$d</xliff:g> βήμα για να γίνετε προγραμματιστής.</item>
     </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 +41,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 +107,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">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> είναι ορατή σε κοντινές συσκευές όταν είναι ανοικτές οι Ρυθμίσεις Bluetooth."</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>
@@ -121,7 +138,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">"Πατήστε για σύζευξη με τη συσκευή <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>
@@ -157,6 +175,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">"Ημερομηνία &amp; ώρα"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Επιλέξτε ζώνη ώρας"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,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 +377,55 @@
     <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">"Οι λειτουργίες προστασίας συσκευής δεν θα ενεργοποιηθούν. Δεν θα μπορείτε να αποτρέψετε άλλους από τη χρήση αυτού του 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>
+    <!-- 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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Αλλαγή μοτίβου ξεκλειδώματος"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Αλλαγή αριθμού PIN ξεκλειδώματος"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Αλλαγή κωδικού πρόσβασης ξεκλειδώματος"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Προσπαθήστε ξανά. Προσπάθεια <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> από <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Τελευταία δοκιμή"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Εάν εισαγάγετε εσφαλμένο πρότυπο εργασίας σε αυτήν την προσπάθεια, το προφίλ εργασίας σας και τα συσχετισμένα δεδομένα θα καταργηθούν από αυτήν τη συσκευή."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Εάν εισαγάγετε εσφαλμένο PIN εργασίας σε αυτήν την προσπάθεια, το προφίλ εργασίας σας και τα συσχετισμένα δεδομένα θα καταργηθούν από αυτήν τη συσκευή."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Εάν εισαγάγετε εσφαλμένο κωδικό πρόσβασης εργασίας σε αυτήν την προσπάθεια, το προφίλ εργασίας σας και τα συσχετισμένα δεδομένα θα καταργηθούν από αυτήν τη συσκευή."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Πάρα πολλές ανεπιτυχείς προσπάθειες. Τα προφίλ εργασίας σας και τα συσχετισμένα δεδομένα θα καταργηθούν από αυτήν τη συσκευή."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Παράβλεψη"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Προσπαθήστε ξανά. Προσπάθεια <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> από <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Τα δεδομένα σας θα διαγραφούν"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Εάν εισαγάγετε εσφαλμένο μοτίβο στην επόμενη προσπάθεια, τα δεδομένα αυτής της συσκευής θα διαγραφούν"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Εάν εισαγάγετε εσφαλμένο PIN στην επόμενη προσπάθεια, τα δεδομένα αυτής της συσκευής θα διαγραφούν"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Εάν εισαγάγετε εσφαλμένο κωδικό πρόσβασης στην επόμενη προσπάθεια, τα δεδομένα αυτής της συσκευής θα διαγραφούν"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Εάν εισαγάγετε εσφαλμένο μοτίβο στην επόμενη προσπάθεια, αυτός ο χρήστης θα διαγραφεί"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Εάν εισαγάγετε εσφαλμένο PIN στην επόμενη προσπάθεια, αυτός ο χρήστης θα διαγραφεί"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Εάν εισαγάγετε εσφαλμένο κωδικό πρόσβασης στην επόμενη προσπάθεια, αυτός ο χρήστης θα διαγραφεί"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Εάν εισαγάγετε εσφαλμένο μοτίβο στην επόμενη προσπάθεια, το προφίλ εργασίας σας και τα δεδομένα του θα διαγραφούν"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Εάν εισαγάγετε εσφαλμένο PIN στην επόμενη προσπάθεια, το προφίλ εργασίας σας και τα δεδομένα του θα διαγραφούν"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Εάν εισαγάγετε εσφαλμένο κωδικό πρόσβασης στην επόμενη προσπάθεια, το προφίλ εργασίας σας και τα δεδομένα του θα διαγραφούν"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Πάρα πολλές ανεπιτυχείς προσπάθειες. Τα δεδομένα συσκευών θα διαγραφούν."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Πάρα πολλές ανεπιτυχείς προσπάθειες. Αυτός ο χρήστης θα διαγραφεί."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Πάρα πολλές ανεπιτυχείς προσπάθειες. Αυτό το προφίλ εργασίας και τα δεδομένα του θα διαγραφούν."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Παράβλεψη"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Πρέπει να αποτελείται από τουλάχιστον <xliff:g id="COUNT">%d</xliff:g> χαρακτήρες"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Το PIN πρέπει να αποτελείται από τουλάχιστον <xliff:g id="COUNT">%d</xliff:g> ψηφία"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Συνέχεια"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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> θα αποσυνδεθεί από τον ήχο handsfree."</string>
@@ -737,7 +801,7 @@
     <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_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">"Πατήστε το κουμπί ρύθμισης προστατευόμενου Wi-Fi στο δρομολογητή σας. Ενδέχεται να ονομάζεται \"WPS\" ή να επισημαίνεται με αυτό το σύμβολο:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Εισαγάγετε το pin <xliff:g id="NUMBER">%1$s</xliff:g> στο δρομολογητή σας Wi-Fi. Η ρύθμιση μπορεί να διαρκέσει έως και δύο λεπτά."</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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"Όνομα δικτύου"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Πληκτρολογήστε το SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ασφάλεια"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"Ενεργοποίηση σημείου πρόσβασης…"</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Διαγραφή κάρτας SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στον εσωτερικό αποθηκευτικό χώρο USB του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στην κάρτα SD, όπως αρχεία μουσικής και φωτογραφίες"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Διαγραφή των eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Διαγραφή όλων των eSIMs στο τηλέφωνο. Αυτή η ενέργεια δεν θα ακυρώσει το πρόγραμμα υπηρεσίας κινητής τηλεφωνίας."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Διαγραφή όλων των eSIMs στο tablet. Αυτή η ενέργεια δεν θα ακυρώσει το πρόγραμμα υπηρεσίας κινητής τηλεφωνίας."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Επαναφορά tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Επαναφορά τηλεφώνου"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Να διαγραφούν όλα τα προσωπικά σας στοιχεία και οι ληφθείσες εφαρμογές; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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 σας και τα προσωπικά δεδομένα σας είναι πιο ευάλωτα σε επιθέσεις από άγνωστες εφαρμογές. Με την εγκατάσταση εφαρμογών από αυτήν την πηγή, συμφωνείτε ότι είστε υπεύθυνοι για οποιαδήποτε ζημιά στο tablet ή απώλεια δεδομένων που μπορεί να προκύψει από τη χρήση τους."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι πιο ευάλωτα σε επιθέσεις από άγνωστες εφαρμογές. Με την εγκατάσταση εφαρμογών από αυτήν την πηγή, συμφωνείτε ότι είστε υπεύθυνοι για οποιαδήποτε ζημιά στο τηλέφωνο ή απώλεια δεδομένων που μπορεί να προκύψει από τη χρήση τους."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Σύνθετες ρυθμίσεις"</string>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"Στην κάρτα SD"</string>
+    <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>
@@ -1559,7 +1667,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">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Ακύρωση"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"Γλώσσες &amp; εισαγωγή"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Γλώσσες &amp; εισαγωγή"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Βοήθεια εισόδου"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"Συνολικός χρόνος CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Διατήρηση λειτουρ."</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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>
@@ -2463,12 +2623,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">
@@ -2553,7 +2713,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>
@@ -2654,17 +2814,20 @@
       <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>
     <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">"μήνυμα κειμένου, αποστολή SMS, μηνύματα, ανταλλαγή μηνυμάτων"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"δίκτυο κινητής τηλεφωνίας, εταιρεία κινητής τηλεφωνίας, ασύρματο, δεδομένα, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,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"</string>
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Αγγίξτε μια ετικέτα για εγγραφή…"</string>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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,10 +3257,16 @@
     <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>
+    <!-- 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_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>
@@ -3187,8 +3355,9 @@
     <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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"Να επιτρέπεται από αυτήν την πηγή"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Περιστρέψτε δύο φορές για κάμερα"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Ανοίξτε την εφαρμογή κάμερας περιστρέφοντας δύο φορές τον καρπό σας"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">1 εφαρμογή επιτρέπεται να χρησιμοποιεί απεριόριστα δεδομένα όταν είναι ενεργή η Εξοικονόμηση δεδομένων</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Εξοικονόμηση δεδομένων"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Απερ/στη πρόσβ. δεδ."</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Απεριόριστα δεδομένα"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Τα δεδομένα παρασκηνίου είναι απενεργοποιημένα"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Ενεργή"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Απενεργοποιημένη"</string>
@@ -3382,7 +3548,6 @@
     <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_warning" msgid="9086859595338944882">"Τα SMS ειδικής χρέωσης ενδέχεται να κοστίσουν και θα αυξήσουν το συνολικό ποσό των λογαριασμών σας κινητού τηλεφώνου. Εάν ενεργοποιήσετε την πρόσβαση για μια εφαρμογή, θα μπορείτε να στέλνετε SMS ειδικής χρέωσης χρησιμοποιώντας τη συγκεκριμένη εφαρμογή."</string>
@@ -3447,28 +3612,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">"Γρήγορες κινήσεις για τον έλεγχο του tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Γρήγορες κινήσεις για τον έλεγχο της συσκευής σας"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Μετάβαση στην κάμερα"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Για να ανοίξετε γρήγορα την κάμερα, πατήστε δύο φορές το κουμπί λειτουργίας. Αυτή η ενέργεια μπορεί να πραγματοποιηθεί από οποιαδήποτε οθόνη."</string>
+    <!-- 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">"Πατήστε δύο φορές για να ελέγξετε το tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Πατήστε δύο φορές για να ελέγξετε τη συσκευή"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Για να ελέγξετε γρήγορα τις ειδοποιήσεις σας, κάντε διπλό πάτημα στην οθόνη."</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">"Σηκώστε το 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>
+    <!-- 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">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος του tablet."</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>
@@ -3572,6 +3764,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Θέλετε να καταργήσετε αυτήν την Instant Εφαρμογή;"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Παιχνίδια"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Αρχεία ήχου"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Χώρος που χρησιμοποιείται"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(απεγκαταστάθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(απενεργοποιήθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Υπηρεσία αυτόματης συμπλήρωσης"</string>
@@ -3585,5 +3778,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant Εφαρμογή"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Απενεργοποίηση διαχείρισης αποθηκευτικού χώρου;"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Εφαρμογές ταινιών και TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Χώρος που χρησιμοποιείται"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Πληροφορίες παροχής εταιρείας κινητής τηλεφωνίας"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ενεργοποίηση παροχής εταιρείας κινητής τηλεφωνίας"</string>
+    <!-- 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-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 395746a..f3beb46 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Good"</item>
     <item msgid="8986346415847956850">"Excellent"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Always"</item>
-    <item msgid="844721238536786870">"Only when plugged in"</item>
-    <item msgid="1986753720941888596">"Never"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Always"</item>
-    <item msgid="7433294150916905997">"Only when plugged in"</item>
-    <item msgid="1390404486722375028">"Never"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Last 30 days"</item>
     <item msgid="6600989128423965319">"Set usage cycle..."</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 40acb04..093af98 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="one">You are now <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> step away from being a developer.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"You don\'t have permission to change Bluetooth settings."</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> is visible to nearby devices while the Bluetooth settings are open."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Last try"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"If you enter an incorrect work pattern on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"If you enter an incorrect work PIN on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"If you enter an incorrect work password on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Too many incorrect attempts. Your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dismiss"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Your data will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"If you enter an incorrect pattern on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"If you enter an incorrect PIN on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"If you enter an incorrect password on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"If you enter an incorrect pattern on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"If you enter an incorrect PIN on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"If you enter an incorrect password on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"If you enter an incorrect pattern on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"If you enter an incorrect PIN on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"If you enter an incorrect password on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Too many incorrect attempts. The data on this device will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Too many incorrect attempts. This user will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Too many incorrect attempts. This work profile and its data will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dismiss"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Must be at least <xliff:g id="COUNT">%d</xliff:g> characters"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN must be at least <xliff:g id="COUNT">%d</xliff:g> digits"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"The wireless router security setting (TKIP) is not supported"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentication failure. Please try again."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Another WPS session was detected. Please try again in a few minutes."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi disconnected. WPS setup cancelled."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Network name"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Enter the SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Security"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Start time"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"On / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Wake screen when you receive notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Show time, notification icons and other info"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Erase eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Erase all eSIMs on the phone. This will not cancel your mobile service plan."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Erase all eSIMs on the tablet. This will not cancel your mobile service plan."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Running"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
+    <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
     <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
     <string name="installed" msgid="3070865169422600098">"Installed"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Screen"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,9 +2814,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_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>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <!-- 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">"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>
@@ -2718,7 +2887,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do not disturb"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, Vibration, Do Not Disturb"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringer set to vibrate"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringer set to silent"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ring volume at 80%"</string>
@@ -2734,7 +2903,7 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen-locking sounds"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen locking sounds"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"Charging sounds"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Docking sounds"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Touch sounds"</string>
@@ -2751,7 +2920,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatic rules turned on</item>
       <item quantity="one">1 automatic rule turned on</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Do not disturb preferences"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Do Not Disturb preferences"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Set Do Not Disturb rules"</string>
@@ -2828,13 +2997,11 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reduce blur (recommended)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reduce flicker"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support picture-in-picture"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support Picture-in-picture"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <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>
@@ -2861,8 +3028,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"Allow notification dot"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Show notification dot"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do not disturb"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do not disturb is set to Priority only"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocked"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priority"</string>
@@ -2943,10 +3110,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Block when screen is on"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prevent notifications silenced by Do not disturb from peeking or popping on screen"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prevent notifications silenced by Do Not Disturb from peeking or popping on screen"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Block when screen is off"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prevent notifications silenced by Do not disturb from turning on the screen or pulsing the notification light"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Prevent notifications silenced by Do not disturb from turning on the screen"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prevent notifications silenced by Do Not Disturb from turning on the screen or pulsing the notification light"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Prevent notifications silenced by Do Not Disturb from turning on the screen"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Off"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"When screen is on"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
@@ -2965,11 +3132,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 +3139,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 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Install unknown apps"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Allow modify system settings"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Allow from this source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestures"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gesture shortcuts"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <!-- 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">"Flip camera"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Raise to open camera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"To open the camera automatically, lift up your phone into a photo-taking position (landscape or portrait). Works when your phone is asleep or locked."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Take photos when phone is asleep or locked"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assist gesture"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitivity"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 395746a..f3beb46 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Good"</item>
     <item msgid="8986346415847956850">"Excellent"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Always"</item>
-    <item msgid="844721238536786870">"Only when plugged in"</item>
-    <item msgid="1986753720941888596">"Never"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Always"</item>
-    <item msgid="7433294150916905997">"Only when plugged in"</item>
-    <item msgid="1390404486722375028">"Never"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Last 30 days"</item>
     <item msgid="6600989128423965319">"Set usage cycle..."</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 40acb04..093af98 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="one">You are now <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> step away from being a developer.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"You don\'t have permission to change Bluetooth settings."</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> is visible to nearby devices while the Bluetooth settings are open."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Last try"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"If you enter an incorrect work pattern on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"If you enter an incorrect work PIN on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"If you enter an incorrect work password on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Too many incorrect attempts. Your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dismiss"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Your data will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"If you enter an incorrect pattern on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"If you enter an incorrect PIN on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"If you enter an incorrect password on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"If you enter an incorrect pattern on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"If you enter an incorrect PIN on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"If you enter an incorrect password on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"If you enter an incorrect pattern on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"If you enter an incorrect PIN on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"If you enter an incorrect password on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Too many incorrect attempts. The data on this device will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Too many incorrect attempts. This user will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Too many incorrect attempts. This work profile and its data will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dismiss"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Must be at least <xliff:g id="COUNT">%d</xliff:g> characters"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN must be at least <xliff:g id="COUNT">%d</xliff:g> digits"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"The wireless router security setting (TKIP) is not supported"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentication failure. Please try again."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Another WPS session was detected. Please try again in a few minutes."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi disconnected. WPS setup cancelled."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Network name"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Enter the SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Security"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Start time"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"On / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Wake screen when you receive notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Show time, notification icons and other info"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Erase eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Erase all eSIMs on the phone. This will not cancel your mobile service plan."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Erase all eSIMs on the tablet. This will not cancel your mobile service plan."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Running"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
+    <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
     <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
     <string name="installed" msgid="3070865169422600098">"Installed"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Screen"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,9 +2814,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_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>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <!-- 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">"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>
@@ -2718,7 +2887,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do not disturb"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, Vibration, Do Not Disturb"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringer set to vibrate"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringer set to silent"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ring volume at 80%"</string>
@@ -2734,7 +2903,7 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen-locking sounds"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen locking sounds"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"Charging sounds"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Docking sounds"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Touch sounds"</string>
@@ -2751,7 +2920,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatic rules turned on</item>
       <item quantity="one">1 automatic rule turned on</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Do not disturb preferences"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Do Not Disturb preferences"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Set Do Not Disturb rules"</string>
@@ -2828,13 +2997,11 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reduce blur (recommended)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reduce flicker"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support picture-in-picture"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support Picture-in-picture"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <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>
@@ -2861,8 +3028,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"Allow notification dot"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Show notification dot"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do not disturb"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do not disturb is set to Priority only"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocked"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priority"</string>
@@ -2943,10 +3110,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Block when screen is on"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prevent notifications silenced by Do not disturb from peeking or popping on screen"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prevent notifications silenced by Do Not Disturb from peeking or popping on screen"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Block when screen is off"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prevent notifications silenced by Do not disturb from turning on the screen or pulsing the notification light"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Prevent notifications silenced by Do not disturb from turning on the screen"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prevent notifications silenced by Do Not Disturb from turning on the screen or pulsing the notification light"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Prevent notifications silenced by Do Not Disturb from turning on the screen"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Off"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"When screen is on"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
@@ -2965,11 +3132,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 +3139,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 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Install unknown apps"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Allow modify system settings"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Allow from this source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestures"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gesture shortcuts"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <!-- 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">"Flip camera"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Raise to open camera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"To open the camera automatically, lift up your phone into a photo-taking position (landscape or portrait). Works when your phone is asleep or locked."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Take photos when phone is asleep or locked"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assist gesture"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitivity"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 395746a..f3beb46 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Good"</item>
     <item msgid="8986346415847956850">"Excellent"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Always"</item>
-    <item msgid="844721238536786870">"Only when plugged in"</item>
-    <item msgid="1986753720941888596">"Never"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Always"</item>
-    <item msgid="7433294150916905997">"Only when plugged in"</item>
-    <item msgid="1390404486722375028">"Never"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Last 30 days"</item>
     <item msgid="6600989128423965319">"Set usage cycle..."</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 40acb04..093af98 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="one">You are now <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> step away from being a developer.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"You don\'t have permission to change Bluetooth settings."</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> is visible to nearby devices while the Bluetooth settings are open."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Your devices"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Change unlock pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Last try"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"If you enter an incorrect work pattern on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"If you enter an incorrect work PIN on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"If you enter an incorrect work password on this attempt, your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Too many incorrect attempts. Your work profile and associated data will be removed from this device."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dismiss"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Try again. Attempt <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> of <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Your data will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"If you enter an incorrect pattern on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"If you enter an incorrect PIN on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"If you enter an incorrect password on the next attempt, data on this device will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"If you enter an incorrect pattern on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"If you enter an incorrect PIN on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"If you enter an incorrect password on the next attempt, this user will be deleted"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"If you enter an incorrect pattern on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"If you enter an incorrect PIN on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"If you enter an incorrect password on the next attempt, your work profile and its data will be deleted"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Too many incorrect attempts. The data on this device will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Too many incorrect attempts. This user will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Too many incorrect attempts. This work profile and its data will be deleted."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dismiss"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Must be at least <xliff:g id="COUNT">%d</xliff:g> characters"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN must be at least <xliff:g id="COUNT">%d</xliff:g> digits"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"The wireless router security setting (TKIP) is not supported"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentication failure. Please try again."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Another WPS session was detected. Please try again in a few minutes."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi disconnected. WPS setup cancelled."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Network name"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Enter the SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Security"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Start time"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"End time"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"On / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Wake screen when you receive notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Always on"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Show time, notification icons and other info"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Erase all the data on the SD card, such as music or photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Erase eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Erase all eSIMs on the phone. This will not cancel your mobile service plan."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Erase all eSIMs on the tablet. This will not cancel your mobile service plan."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reset tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset phone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Erase all your personal information and downloaded apps? You can\'t undo this action!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Running"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
+    <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
     <string name="not_installed" msgid="2797554494953450291">"Not installed for this user"</string>
     <string name="installed" msgid="3070865169422600098">"Installed"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Screen"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,9 +2814,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_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>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <!-- 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">"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>
@@ -2718,7 +2887,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do not disturb"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, Vibration, Do Not Disturb"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringer set to vibrate"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringer set to silent"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Ring volume at 80%"</string>
@@ -2734,7 +2903,7 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen-locking sounds"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen locking sounds"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"Charging sounds"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Docking sounds"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Touch sounds"</string>
@@ -2751,7 +2920,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatic rules turned on</item>
       <item quantity="one">1 automatic rule turned on</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Do not disturb preferences"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Do Not Disturb preferences"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priority only allows"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatic rules"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Set Do Not Disturb rules"</string>
@@ -2828,13 +2997,11 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reduce blur (recommended)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reduce flicker"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support picture-in-picture"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support Picture-in-picture"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
     <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>
@@ -2861,8 +3028,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"Allow notification dot"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Show notification dot"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do not disturb"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do not disturb is set to Priority only"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocked"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priority"</string>
@@ -2943,10 +3110,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Change to always interrupt"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Block when screen is on"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prevent notifications silenced by Do not disturb from peeking or popping on screen"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Prevent notifications silenced by Do Not Disturb from peeking or popping on screen"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Block when screen is off"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prevent notifications silenced by Do not disturb from turning on the screen or pulsing the notification light"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Prevent notifications silenced by Do not disturb from turning on the screen"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Prevent notifications silenced by Do Not Disturb from turning on the screen or pulsing the notification light"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Prevent notifications silenced by Do Not Disturb from turning on the screen"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Off"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"When screen is on"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"When screen is off"</string>
@@ -2965,11 +3132,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 +3139,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 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Install unknown apps"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Allow modify system settings"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Allow from this source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Free up space now"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestures"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gesture shortcuts"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
+    <!-- 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">"Flip camera"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Raise to open camera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"To open the camera automatically, lift up your phone into a photo-taking position (landscape or portrait). Works when your phone is asleep or locked."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Take photos when phone is asleep or locked"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assist gesture"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitivity"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index d40bb83..a476f83 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Buena"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Siempre"</item>
-    <item msgid="844721238536786870">"Sólo cuando está conectado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Siempre"</item>
-    <item msgid="7433294150916905997">"Sólo cuando está conectado"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 días"</item>
     <item msgid="6600989128423965319">"Configurar ciclo de uso…"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 367d00c..1d4a400 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Rechazar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Cerrar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Cambiar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Estás a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser programador.</item>
       <item quantity="one">Estás a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> paso de ser programador.</item>
     </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 +41,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>
@@ -104,12 +105,28 @@
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"Configuración del perfil"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No se ha establecido ningún nombre; se utiliza el nombre de cuenta"</string>
     <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_device" msgid="4352483834491958740">"Cambiar nombre de dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Cambiar nombre"</string>
-    <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Esto pondrá fin a tu conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <!-- 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">"No tienes permiso para cambiar la configuración de Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"¿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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige la zona horaria"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"¿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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón de desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar la contraseña de desbloqueo"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Vuelve a intentarlo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Último intento"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si ingresas un patrón de trabajo incorrecto en este intento, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si ingresas un PIN de trabajo incorrecto en este intento, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si ingresas una contraseña de trabajo incorrecta en este intento, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Hubo demasiados intentos incorrectos. El perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Descartar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Vuelve a intentarlo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Se borrarán tus datos"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si ingresas un patrón incorrecto en el próximo intento, se borrarán los datos de este dispositivo"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si ingresas un PIN incorrecto en el próximo intento, se borrarán los datos de este dispositivo"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si ingresas una contraseña incorrecta en el próximo intento, se borrarán los datos de este dispositivo"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si ingresas un patrón incorrecto en el próximo intento, se borrará este usuario"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si ingresas un PIN incorrecto en el próximo intento, se borrará este usuario"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si ingresas una contraseña incorrecta en el próximo intento, se borrará este usuario"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si ingresas un patrón incorrecto en el próximo intento, se borrarán tu perfil de trabajo y sus datos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si ingresas un PIN incorrecto en el próximo intento, se borrarán tu perfil de trabajo y sus datos"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si ingresas una contraseña incorrecta en el próximo intento, se borrarán tu perfil de trabajo y sus datos"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Hubo demasiados intentos incorrectos. Se borrarán los datos de este dispositivo."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Hubo demasiados intentos incorrectos. Se borrará este usuario."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Hubo demasiados intentos incorrectos. Se borrarán este perfil de trabajo y sus datos."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Descartar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Debe tener al menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"El PIN debe tener al menos <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite la configuración de seguridad del enrutador inalámbrico (TKIP)."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se produjo un error al realizar la autenticación. Vuelve a intentarlo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se detectó otra sesión WPS. Vuelve a intentarlo en unos minutos."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Se perdió la conexión Wi-Fi. Se canceló la configuración de WPS."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nombre de la red"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Ingresa el SSID."</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
@@ -810,7 +873,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>
@@ -847,9 +909,28 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Deseas borrar este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Zona Wi-Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Usar conexión móvil para brindar Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"No se comparte la conexión a Internet de esta tablet mediante hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"No se comparte la conexión a Internet de este teléfono mediante hotspot"</string>
+    <!-- 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_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">"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>
@@ -896,6 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Activado/<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">"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 +1112,19 @@
     <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="doze_summary" msgid="3846219936142814032">"Activar la pantalla cuando haya notificaciones"</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">"Activar la pantalla al recibir notificaciones"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Siempre activada"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar hora, íconos de notificaciones y otra información"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o reduce el tamaño del texto en pantalla"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueo de la tarjeta SIM"</string>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"El APN no puede estar vacío."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"El campo de MCC debe contener 3 dígitos."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"El campo MNC debe contener 2 ó 3 dígitos."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"El proveedor no permite que se agreguen APN del tipo %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando la configuración APN predeterminada"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restablecer valores predeterminados"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se restableció la configuración predeterminada de APN."</string>
@@ -1292,7 +1396,7 @@
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"Se restablecerán el almacenamiento interno y todos los datos"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, por ejemplo:\n\n"<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de las aplicaciones"</li>\n<li>"las aplicaciones descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:\n\n"<li>"La cuenta de Google"</li>\n<li>"Datos de apps y configuraciones"</li>\n<li>"Apps descargadas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:\n\n"<li>"La cuenta de Google"</li>\n<li>"Datos de apps y configuraciones,"</li>\n<li>"Apps descargadas"</li></string>
     <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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos los datos del almacenamiento USB, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos los datos de la tarjeta SD, como música o fotos."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Borrar eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Borra todas las eSIM del teléfono. No se cancelará tu plan de servicio de datos móviles."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Borra todas las eSIM de la tablet. No se cancelará tu plan de servicio de datos móviles."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer la tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer dispositivo"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"¿Deseas eliminar toda tu información personal y las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
@@ -1321,33 +1428,27 @@
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot activado, conexión mediante dispositivo portátil"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot activado"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Conexión mediante dispositivo portátil"</string>
-    <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="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No podrán establecerse conexiones a través del dispositivo portátil ni hotspots portátiles cuando se active el modo de ahorro de datos."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Anclaje a red USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Conectado al USB, verificar el anclaje a redes"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Anclado a red"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"No se puede anclar a red si el almacenamiento USB está en uso."</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no conectado"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Conéctate para activar."</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error de anclaje a red USB"</string>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
-    <string name="sms_application_title" msgid="4903928270533250448">"SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicación de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Quieres cambiar la aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"¿Quieres usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como la aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"¿Quieres usar <xliff:g id="NEW_APP">%s</xliff:g> como la aplicación de SMS?"</string>
@@ -1376,7 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Inhabilitadas"</string>
     <string name="not_installed" msgid="2797554494953450291">"No instalada para este usuario"</string>
     <string name="installed" msgid="3070865169422600098">"Instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
@@ -1610,7 +1718,7 @@
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactivas las notificaciones de esta aplicación, es posible que no recibas actualizaciones y alertas importantes."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalles de la app"</string>
-    <string name="app_install_details_summary" msgid="6464796332049327547">"App instalada desde <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="app_install_details_summary" msgid="6464796332049327547">"La app se instaló desde <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"Más información en <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operaciones de las aplicaciones"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"En curso"</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Pantalla"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Linterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Cámara"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2567,10 +2727,10 @@
     <string name="support_summary" msgid="8276116616493882830">"Artículos de ayuda, asistencia por chat y teléfono"</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>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"Recibir alertas de amenazas extremas contra la vida y propiedad"</string>
+    <string name="extreme_threats_title" msgid="6549541803542968699">"Amenazas serias"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"Recibir alertas de amenazas serias para la vida y propiedad"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Amenazas graves"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Recibir alertas de amenazas graves contra la vida y la propiedad"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Recibir alertas de amenazas graves a la vida y la propiedad"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"Alertas AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Recibir boletines sobre secuestros de menores"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Repetir"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Apps predeterminadas"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, hora, copia de seguridad, actualizaciones"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Buscar en la configuración"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Buscar en la configuración"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Configuración de búsqueda"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Configuración de búsqueda"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexión de red"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensaje de texto, enviar sms, mensajes, centro de mensajes"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, móvil, operador de telefonía celular, inalámbrico, datos, 4G, 3G, 2G, LTE"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, presionar, pagos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"copia de seguridad, copia"</string>
+    <!-- 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">"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>
@@ -2784,12 +2953,12 @@
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas las notificaciones"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar contenido confidencial de notificaciones"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"No mostrar notificaciones"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"¿Cómo deseas ver las notificaciones cuando esté bloqueado el dispositivo?"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"¿Cómo deseas ver 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 el contenido de notificaciones de trabajo"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Ocultar contenido confidencial de notificaciones"</string>
     <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_message_profile" msgid="8307705621027472346">"¿Cómo deseas ver las notificaciones de perfil cuando el dispositivo esté bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificaciones de perfil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notificaciones"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
@@ -2831,8 +3000,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>
@@ -2919,7 +3086,7 @@
     <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>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactos seleccionados"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Emisores seleccionados"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Llamadas repetidas"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Permitir llamada si la misma persona llama por segunda vez en un período de <xliff:g id="MINUTES">%d</xliff:g> minuto(s)"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automáticam."</string>
@@ -2963,11 +3130,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 +3137,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>
@@ -3067,9 +3229,9 @@
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceptar"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Rechazar"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Elegir la entrada de voz"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"Navegador"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicación del navegador"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"No hay un navegador predeterminado."</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Teléfono"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Aplicación de teléfono"</string>
     <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predeterminada de sistema)"</string>
@@ -3093,13 +3255,19 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
     <string name="high_power_system" msgid="7362862974428225301">"Optimización de la batería no disponible"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"No se aplica la optimización de la batería, por lo que se puede agotar más rápido."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"¿Deseas permitir que la app se ejecute siempre en segundo plano?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"Si permites que <xliff:g id="APP_NAME">%1$s</xliff:g> se ejecute siempre en segundo plano, es posible que se reduzca la duración de la batería. \n\nPuedes cambiar esta opción más tarde en Configuración &gt; Apps y notificaciones."</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Permitir que <xliff:g id="APP_NAME">%1$s</xliff:g> se ejecute siempre en segundo plano podría reducir la duración de la batería. \n\nPuedes cambiar esta opción más tarde en Configuración &gt; Apps y notificaciones."</string>
     <string name="battery_summary" msgid="8044042095190688654">"Se usó el <xliff:g id="PERCENTAGE">%1$s</xliff:g> desde la última carga completa"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Administración de energía"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"No se usó la batería desde la última carga completa."</string>
@@ -3185,8 +3353,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalar apps desconocidas"</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>
@@ -3198,8 +3367,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Permiso para modificar la configuración del sistema"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificar configuración del sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Este permiso admite que una aplicación modifique la configuración del sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Confiar en esta fuente"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Gira la muñeca dos veces para la cámara"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación de la cámara"</string>
@@ -3294,8 +3461,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Advertencia de datos: <xliff:g id="ID_1">%1$s</xliff:g>/Límite de datos: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo de facturación"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Ciclo mensual a partir del <xliff:g id="ID_1">%1$s</xliff:g> de cada mes"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"De forma mensual a partir del <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"El <xliff:g id="ID_1">%1$s</xliff:g> de cada mes"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restricciones de red"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restricciones</item>
@@ -3314,14 +3480,14 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps tienen permiso para usar datos sin restricción cuando se activa Reducir datos</item>
       <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="data_saver_title" msgid="398458827917495765">"Reducir datos"</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>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso de datos sin restricción"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Acceso a datos sin restricción"</string>
-    <string name="home_app" msgid="4066188520886810030">"Página principal"</string>
+    <string name="home_app" msgid="4066188520886810030">"App de la página principal"</string>
     <string name="no_default_home" msgid="7184117487704520238">"No hay ninguna página principal predeterminada"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Inicio seguro"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Solicitar patrón para iniciar tu dispositivo. Mientras esté apagado, no podrá recibir llamadas, mensajes, notificaciones ni alarmas."</string>
@@ -3380,7 +3546,6 @@
     <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="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>
@@ -3391,8 +3556,8 @@
     <string name="demo_mode" msgid="2798762752209330277">"Modo demostración de la IU del sistema"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de configuración rápida para programadores"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aquí para ayudarte"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponibles todos los días, las 24 horas."</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos disponibles todos los días, las 24 horas."</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponibles a toda hora, todos los días"</string>
+    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos disponibles a toda hora, todos los días"</string>
     <string name="support_escalation_summary" msgid="8473084168776014405">"Nuestro equipo de asistencia está disponible para solucionar cualquier problema"</string>
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nuestro equipo de asistencia está disponible a toda hora, todos los días"</string>
     <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Busca ayuda o vuelve en el horario de atención (hora local):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
@@ -3445,28 +3610,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espacio ahora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gestos de acceso directo"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar tu teléfono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar tu tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar tu dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ir a la cámara"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir la cámara rápidamente, presiona dos veces el botón de encendido (funciona desde cualquier pantalla)."</string>
+    <!-- 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">"Alternar cámara"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior del teléfono."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior de la tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior del dispositivo."</string>
+    <!-- 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">"Levanta el teléfono para abrir la cámara"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir la cámara automáticamente, levanta el teléfono como si fueras a tomar una foto (en modo vertical u horizontal). Esta acción funciona con el teléfono bloqueado o en modo de suspensión."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Toma fotos cuando el teléfono está inactivo o bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de asistencia"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidad"</string>
@@ -3570,6 +3762,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 +3776,10 @@
     <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>
+    <!-- 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-es/arrays.xml b/res/values-es/arrays.xml
index ea13054..bd5e0d9 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Buena"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Siempre"</item>
-    <item msgid="844721238536786870">"Solo si se está cargando"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Siempre"</item>
-    <item msgid="7433294150916905997">"Solo si se está cargando"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 días"</item>
     <item msgid="6600989128423965319">"Establecer ciclo uso..."</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 888461c..5310e19 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Denegar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Cerrar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Cambiar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Solo te quedan <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser un desarrollador.</item>
       <item quantity="one">Solo te queda <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> paso de ser un desarrollador.</item>
     </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 +41,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>
@@ -90,7 +91,7 @@
     <string name="font_size_save" msgid="3450855718056759095">"Aceptar"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Almacenamiento USB"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Tarjeta SD"</string>
-    <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Oculto para otros dispositivos Bluetooth"</string>
@@ -106,10 +107,26 @@
     <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>
+    <!-- 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">"No tienes permiso para cambiar los ajustes de Bluetooth."</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> será visible para dispositivos cercanos mientras los ajustes de Bluetooth estén abiertos."</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">"¿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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Elige una zona horaria"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"¿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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambiar patrón desbloqueo"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar contraseña de desbloqueo"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Vuelve a intentarlo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Último intento"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si vuelves a introducir un patrón de trabajo incorrecto, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si vuelves a introducir un PIN de trabajo incorrecto, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si vuelves a introducir una contraseña de trabajo incorrecta, el perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Has fallado demasiadas veces. El perfil de trabajo y los datos asociados se quitarán de este dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Descartar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Vuelve a intentarlo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Tus datos se eliminarán"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si vuelves a introducir un patrón incorrecto, los datos de este dispositivo se eliminarán"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si vuelves a introducir un PIN incorrecto, los datos de este dispositivo se eliminarán"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si vuelves a introducir una contraseña incorrecta, los datos de este dispositivo se eliminarán"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si vuelves a introducir un patrón incorrecto, este usuario se eliminará"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si vuelves a introducir un PIN incorrecto, este usuario se eliminará"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si vuelves a introducir una contraseña incorrecta, este usuario se eliminará"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si vuelves a introducir un patrón incorrecto, tu perfil de trabajo y sus datos se eliminarán"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si vuelves a introducir un PIN incorrecto, tu perfil de trabajo y sus datos se eliminarán"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si vuelves a introducir una contraseña incorrecta, tu perfil de trabajo y sus datos se eliminarán"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Se han producido demasiados intentos fallidos. Los datos de este dispositivo se eliminarán."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Se han producido demasiados intentos fallidos. Este usuario se eliminará."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Se han producido demasiados intentos fallidos. Este perfil de trabajo y sus datos se eliminarán."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Debe tener al menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"El PIN debe tener al menos <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -581,7 +629,7 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agentes de confianza activos</item>
       <item quantity="one">1 agente de confianza activo</item>
     </plurals>
-    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
@@ -613,7 +661,7 @@
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"¿Compartir agenda telefónica?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> quiere acceder a tus contactos y al historial de llamadas."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> quiere vincularse con Bluetooth. Al conectarse, podrá acceder a contactos e historial de llamadas."</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos vinculados"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos sincronizados"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Dispositivos disponibles"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"No hay dispositivos disponibles"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectar"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite el ajuste de seguridad del router inalámbrico (protocolo TKIP)."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se ha producido un error de autenticación. Inténtalo de nuevo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se ha detectado otra configuración WPS. Inténtalo de nuevo en unos minutos."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Se ha desconectado la red Wi‑Fi y se ha cancelado la configuración WPS."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nombre de la red"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Introduce el SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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>
@@ -896,6 +977,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>
@@ -980,37 +1062,47 @@
     <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>
+    <!-- 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">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensidad"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"Desactivado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"No se activará nunca automáticamente."</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Se activará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Se activará automáticamente al anochecer."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Activado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"No se desactivará nunca automáticamente."</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Se desactivará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Se desactivará automáticamente al amanecer."</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"No/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- 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">"Activado/<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">"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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Predeterminado"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Personalizado"</string>
-    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Cambiar el fondo de pantalla"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Cambia el fondo de pantalla"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personaliza la pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Seleccionar fondo de..."</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Salvapantallas"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Durante la carga o si está conectado a una base"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Con el dispositivo en una base"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Con el dispositivo en un dock"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Nunca"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar lo que ocurre cuando el teléfono está en un dock o inactivo, activa el salvapantallas."</string>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"Activar pantalla al recibir notificaciones"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Siempre activada"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar la hora, iconos de notificación y otra información"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de la fuente"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o disminuye el tamaño del texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo de tarjeta SIM"</string>
@@ -1161,7 +1264,7 @@
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurar"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorar"</string>
     <string name="storage_menu_free" msgid="6386070442027135427">"Liberar espacio"</string>
-    <string name="storage_menu_manage" msgid="5914482953856430780">"Gestionar almacenamiento"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"Administrar almacenamiento"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Conexión USB a ordenador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar como"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimedia (MTP)"</string>
@@ -1273,6 +1376,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>
@@ -1293,7 +1397,7 @@
     <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>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, 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>
-    <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_accounts" product="default" msgid="6412857499147999073">\n\n"Has accedido a 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_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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos los datos del almacenamiento USB interno, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borrar todos los datos de la tarjeta SD"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Borrar contenido de eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Borra todas las tarjetas eSIM del teléfono. Esta acción no cancelará tu plan de servicios móviles."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Borra todas las tarjetas eSIM del tablet. Esta acción no cancelará tu plan de servicios móviles."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"¿Quieres borrar toda tu información personal y todas las aplicaciones descargadas? Esta acción no se puede deshacer."</string>
@@ -1313,37 +1420,31 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Espera..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ajustes de llamadas"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurar buzón, llamada en espera, desvío e identificador"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Compartir conexión por USB"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Compartir por USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona Wi-Fi portátil"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Compartir conexión por Bluetooth"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Compartir conexión"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Zona Wi-Fi/Compartir conexión"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Zona Wi-Fi activada, conexión compartida"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Compartir por Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Compartir Internet"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Punto de acceso/conexión con dispositivo"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Punto de acceso activado, conexión mediante dispositivo portátil"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Punto de acceso activado"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Compartir conexión"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Conexión mediante dispositivo portátil"</string>
     <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="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="usb_tethering_button_text" msgid="585829947108007917">"Compartir por USB"</string>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Compartir por Bluetooth"</string>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1425,7 +1526,7 @@
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Elige tu 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>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma el número 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 números PIN no coinciden"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Método de desbloqueo"</string>
@@ -1443,7 +1544,7 @@
     <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Introduce la contraseña del dispositivo para continuar (paso necesario después de reiniciar)."</string>
     <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Utiliza el patrón de tu perfil de trabajo para continuar (paso necesario después de reiniciar)."</string>
     <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Introduce el PIN de tu perfil de trabajo para continuar (paso necesario después de reiniciar)."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Introduce la contraseña del perfil de trabajo para continuar (paso necesario después de reiniciar)."</string>
+    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Escribe la contraseña del perfil de trabajo para continuar (paso necesario después de reiniciar)."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN incorrecto"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Contraseña incorrecta"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Patrón incorrecto"</string>
@@ -1491,6 +1592,12 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Ajustes de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Orígenes desconocidos"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas las fuentes"</string>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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 +1644,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">"Restablecer preferencias"</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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Inhabilitada"</string>
     <string name="not_installed" msgid="2797554494953450291">"No instalada para este usuario"</string>
     <string name="installed" msgid="3070865169422600098">"Instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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>
@@ -1912,7 +2029,7 @@
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Búsqueda de redes móviles"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"hace <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de las aplicaciones desde la última carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde la carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso del dispositivo desde la carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que la pantalla ha estado encendida desde la carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la carga completa"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Pantalla"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Linterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Cámara"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2014,7 +2174,7 @@
     <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>
-    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> del uso total de las aplicaciones (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> del total del uso de las aplicaciones (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Desde la carga completa"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"Gestionar uso de la batería"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tiempo restante estimado"</string>
@@ -2226,10 +2386,10 @@
     <string name="work_mode_label" msgid="5794470908668593961">"Modo de trabajo"</string>
     <string name="work_mode_summary" msgid="1620246003886940776">"Permitir que se utilice el modo de trabajo, incluidas las aplicaciones, la sincronización en segundo plano y las funciones relacionadas"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"Quitar perfil de trabajo"</string>
-    <string name="background_data" msgid="5779592891375473817">"Datos en segundo plano"</string>
+    <string name="background_data" msgid="5779592891375473817">"Conexiones automáticas"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"Las aplicaciones pueden sincronizar datos, enviarlos y recibirlos."</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"¿Inhabilitar datos en segundo plano?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"Si inhabilitas los datos en segundo plano, aumentarás la duración de la batería y reducirás el uso de datos. Es posible que algunas aplicaciones sigan usando los datos en segundo plano."</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"¿Inhabilitar conexiones automáticas?"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"Si inhabilitas las conexiones automáticas, aumentarás la duración de la batería y reducirás el uso de datos. Es posible que algunas aplicaciones sigan usando las conexiones automáticas."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Sincronizar datos aplicaciones autom."</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronización activa"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"La sincronización está desactivada"</string>
@@ -2261,7 +2421,7 @@
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"No se puede hacer la sincronización de forma manual."</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento no está disponible en este momento. Para modificar tu preferencia, activa temporalmente los datos en segundo plano y la sincronización automática."</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento no está disponible en este momento. Para modificar tu preferencia, activa temporalmente las conexiones automáticas y la sincronización automática."</string>
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar tu dispositivo Android, introduce tu contraseña"</string>
@@ -2287,8 +2447,8 @@
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo de uso"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Uso de las aplicaciones"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Itinerancia de datos"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir datos en segundo plano"</string>
-    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Permitir datos en segundo plano"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir conexiones automáticas"</string>
+    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Permitir conexiones automáticas"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Dividir uso de 4G"</string>
     <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Mostrar Wi‑Fi"</string>
     <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Ocultar Wi‑Fi"</string>
@@ -2324,13 +2484,13 @@
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Datos 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Datos 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Primer plano:"</string>
-    <string name="data_usage_background_label" msgid="2722008379947694926">"Datos en segundo plano:"</string>
+    <string name="data_usage_background_label" msgid="2722008379947694926">"Conexiones automáticas:"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"Ajustes de la aplicación"</string>
-    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Datos en segundo plano"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Habilitar el uso de datos móviles con datos en segundo plano"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir los datos en segundo plano, establece un límite de datos móviles."</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir datos en segundo plano?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar datos en segundo plano cuando solo haya disponibles redes móviles.\n\nPuedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
+    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Conexiones automáticas"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Habilitar el uso de datos móviles en segundo plano"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir las conexiones automáticas, establece un límite de datos móviles."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir conexiones automáticas?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar conexiones automáticas cuando solo haya disponibles redes móviles.\n\nPuedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Solo puedes restringir el uso de datos en segundo plano si estableces un límite de datos móviles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"¿Activar sincronización automática?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Los cambios que hagas en tus cuentas en la Web se copiarán automáticamente en el tablet.\n\nEs posible que algunas cuentas copien también en la Web los cambios que hagas en el tablet. Así funcionan las cuentas de Google."</string>
@@ -2345,10 +2505,10 @@
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar uso de datos"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"El tablet desactivará los datos móviles cuando se alcance el límite establecido.\n\nSe tiene en cuenta el uso de datos medido por el tablet, aunque tu operador podría registrarlo de forma diferente. Por tanto, debes ser prudente al establecer un límite."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"El teléfono desactivará los datos móviles cuando se alcance el límite establecido.\n\nSe tiene en cuenta el uso de datos medido por el teléfono, aunque tu operador podría registrarlo de forma diferente. Por tanto, debes ser prudente al establecer un límite."</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir datos en segundo plano?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"Si restringes el uso de datos en segundo plano móviles, algunas aplicaciones y servicios no funcionarán si no tienes conexión a una red Wi‑Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Si restringes el uso de datos en segundo plano, algunas aplicaciones y servicios no funcionarán si no tienes conexión a una red Wi‑Fi.\n\nEsta configuración afecta a todos los usuarios del tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Si restringes el uso de datos en segundo plano, algunas aplicaciones y servicios no funcionarán si no tienes conexión a una red Wi‑Fi.\n\nEsta configuración afecta a todos los usuarios del teléfono."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir conexiones automáticas?"</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"Si restringes el uso de datos móviles en segundo plano, algunas aplicaciones y servicios no funcionarán si no tienes conexión a una red Wi‑Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Si restringes el uso de datos móviles en segundo plano, algunas aplicaciones y servicios no funcionarán si no tienes conexión a una red Wi‑Fi.\n\nEsta configuración afecta a todos los usuarios del tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Si restringes el uso de datos móviles en segundo plano, algunas aplicaciones y servicios no funcionarán si no tienes conexión a una red Wi‑Fi.\n\nEsta configuración afecta a todos los usuarios del teléfono."</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">"aviso"</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">"límite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaciones eliminadas"</string>
@@ -2567,7 +2727,7 @@
     <string name="support_summary" msgid="8276116616493882830">"Artículos de ayuda, asistencia por teléfono y chat"</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>
+    <string name="extreme_threats_title" msgid="6549541803542968699">"Amenazas graves"</string>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Recibe alertas de amenazas graves contra la vida y propiedad"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Amenazas graves"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"Recibe alertas de amenazas graves contra la vida y propiedad"</string>
@@ -2581,7 +2741,7 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"Radiodifusiones de emergencia"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadores de red"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"Nombres de punto de acceso"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"Nombre de punto de acceso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo 4G LTE mejorado"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Usar datos LTE para mejorar la voz y las comunicaciones (recomendado)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"Tipo de red preferido"</string>
@@ -2641,7 +2801,7 @@
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"Descarga de red preferida"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Inhab. emisión nombre red"</string>
     <string name="preferred_network_offload_footer" msgid="5857279426054744020">"Si no emites el nombre de la red, los usuarios externos no podrá acceder a la información de tu red."</string>
-    <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Si no emites el nombre de la red, los datos en segundo plano no podrán ocultar las redes."</string>
+    <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Si no emites el nombre de la red, las conexiones automáticas no podrán ocultar las redes."</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">"Tarjetas SIM cambiadas."</string>
     <string name="sim_notification_summary" msgid="8858043655706669772">"Toca para configurar"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicaciones predeterminadas"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, hora, copias de seguridad y actualizaciones"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ajustes"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Busca en los ajustes"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Busca en los ajustes"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Ajustes de búsqueda"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Ajustes de búsqueda"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexión de red"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensaje de texto, texto, mensajes mensajería"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"móvil, operador móvil, conexión inalámbrica, datos, 4G, 3G, 2G, LTE"</string>
@@ -2689,7 +2852,7 @@
     <string name="keywords_sounds" msgid="7146245090127541167">"sonido del altavoz"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"no molestar, interrumpir, interrupción, descanso"</string>
     <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
-    <string name="keywords_location" msgid="6615286961552714686">"nearby, cercano, ubicación, historial, informes"</string>
+    <string name="keywords_location" msgid="6615286961552714686">"cercano, ubicación, historial, informes"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"precisión"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"cuenta"</string>
     <string name="keywords_users" msgid="3434190133131387942">"restricción, restringir, restringido"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"copia de seguridad, copia seguridad"</string>
+    <!-- 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">"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>
@@ -2776,9 +2945,9 @@
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tonos de llamada"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Otros sonidos y vibraciones"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificaciones"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"Ajustes avanzados"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"Opciones avanzadas"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir burbujas de notificación"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir puntos notificación"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz parpadeante"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"En la pantalla de bloqueo"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo el contenido de las notificaciones"</string>
@@ -2824,17 +2993,15 @@
     <string name="no_vr_listeners" msgid="2689382881717507390">"Ninguna aplicación instalada ha solicitado ejecutarse como servicios de ayuda de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"¿Permitir que el servicio de RV acceda a <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> podrá ejecutarse cuando utilices aplicaciones en el modo de realidad virtual."</string>
-    <string name="display_vr_pref_title" msgid="8104485269504335481">"Cuando el dispositivo está en modo RV"</string>
+    <string name="display_vr_pref_title" msgid="8104485269504335481">"Cuando el dispositivo está en el modo de RV"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reducir desenfoque (recomendado)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reducir parpadeo"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Imagen en imagen"</string>
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Las aplicaciones instaladas no admiten el modo Imagen en imagen"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"imagen PIP en"</string>
     <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_switch" msgid="1131910667023738296">"Permitir imagen en imagen"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que la aplicación cree una ventana imagen en imagen mientras esté abierta o después de que hayas salido de ella (por ejemplo, para seguir viendo un vídeo). La ventana se muestra sobre otras aplicaciones que estés utilizando."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Sí"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso a No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada ha solicitado acceso de No molestar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
@@ -2859,9 +3026,9 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"No mostrar nunca estas notificaciones"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificaciones"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostrar nunca notificaciones en el panel de notificaciones ni en dispositivos periféricos"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"Permitir burbuja de notificación"</string>
-    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar burbuja de notificación"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Omitir No molestar"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"Permitir punto de notificación"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar punto de notificación"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Priorizar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"No bloquear notificaciones cuando la opción No molestar esté establecida en Solo prioritarias"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla de bloqueo"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueada"</string>
@@ -2965,11 +3132,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de trabajo está administrado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotación del dispositivo"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Girar el contenido de la pantalla"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Mantener vista vertical"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Mantener vista horizontal"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mantener orientación actual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicio seguro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Para proteger aún más tu dispositivo, haz que solicite tu PIN antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia. \n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir PIN al iniciar el dispositivo?"</string>
@@ -2977,7 +3139,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Para proteger aún más tu dispositivo, haz que solicite la contraseña antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia. \n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite tu PIN antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir PIN al iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite el patrón antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir patrón al iniciar el dispositivo?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite la contraseña antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Además de utilizar tu huella digital para desbloquear el dispositivo, puedes protegerlo aún más configurándolo para que solicite una contraseña antes de que se inicie. Hasta entonces, no podrás recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsto permite proteger los datos en dispositivos perdidos o robados. ¿Quieres que el dispositivo pida la contraseña para iniciarse?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"¿Solicitar PIN?"</string>
@@ -3040,7 +3202,7 @@
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorías: poca importancia"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorías: desactivadas"</string>
     <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Categorías: prioritarias"</string>
-    <string name="advanced_apps" msgid="4812975097124803873">"Ajustes avanzados"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Opciones avanzadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicaciones"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
@@ -3094,16 +3256,22 @@
     <string name="high_power_apps" msgid="3459065925679828230">"Optimización de batería"</string>
     <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="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de la aplicación"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicaciones no funcionan con normalidad</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> no funciona con normalidad</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
-    <string name="high_power_system" msgid="7362862974428225301">"Optimización de batería no disponible"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Optimización de la batería no disponible"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"No se aplica la optimización de la batería, por lo que se puede agotar más rápido."</string>
-    <string name="high_power_prompt_title" msgid="6358673688590282655">"¿Permitir que la aplicación esté activa siempre en segundo plano?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"Si permites que <xliff:g id="APP_NAME">%1$s</xliff:g> está activa siempre en segundo plano, es posible que se reduzca la duración de la batería. \n\nPuedes cambiar esta opción en cualquier momento en Ajustes &gt; Aplicaciones y notificaciones."</string>
+    <string name="high_power_prompt_title" msgid="6358673688590282655">"¿Permitir que la aplicación se ejecute siempre en segundo plano?"</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Si permites que <xliff:g id="APP_NAME">%1$s</xliff:g> se ejecute siempre en segundo plano, es posible que se reduzca la duración de la batería. \n\nPuedes cambiar esta opción en cualquier momento en Ajustes &gt; Aplicaciones y notificaciones."</string>
     <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> de uso desde la última carga completa"</string>
-    <string name="battery_power_management" msgid="5571519699679107523">"Gestión de la batería"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"Ajustes de batería"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"No ha usado batería desde la última carga completa"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Ajustes de aplicaciones"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"Mostrar SystemUI Tuner"</string>
@@ -3187,8 +3355,9 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Mostrar sobre otras apps"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicaciones que se pueden mostrar sobre otras"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicaciones con permiso"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Sí"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Permitida"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"No permitida"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Instalar aplicaciones desconocidas"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Permiso de aplicación para modificar ajustes sistema"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Permitir que se modifiquen ajustes sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Cuando se concede este permiso, la aplicación puede modificar los ajustes del sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Autorizar descargas de esta fuente"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Doble giro para abrir la cámara"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación Cámara"</string>
@@ -3233,8 +3400,8 @@
     <string name="notification_summary_none" msgid="4586376436702610">"Activadas para todas las aplicaciones"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplicaciones instaladas"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 aplicaciones instaladas"</string>
-    <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> usado - <xliff:g id="FREE_SPACE">%2$s</xliff:g> disponible"</string>
-    <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Almacenamiento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> usado (<xliff:g id="FREE_SPACE">%2$s</xliff:g> disponible)"</string>
+    <string name="storage_summary" msgid="3801281635351732202">"Usado: <xliff:g id="PERCENTAGE">%1$s</xliff:g>, disponible: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Almacenamiento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> usado (disponible: <xliff:g id="FREE_SPACE">%2$s</xliff:g>)"</string>
     <string name="display_summary" msgid="6737806235882127328">"Suspender tras <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"Fondo de pantalla, suspensión, tamaño de la fuente"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"Suspender tras 10 minutos de inactividad"</string>
@@ -3267,11 +3434,11 @@
     <string name="condition_airplane_summary" msgid="5561586417832393666">"La red móvil, la conexión Wi-Fi y el Bluetooth están desactivados. No puedes hacer llamadas ni conectarte a Internet."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"No molestar activado (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Ahorro de batería activado"</string>
-    <string name="condition_battery_summary" msgid="4418839236027977450">"Ha disminuido el rendimiento. Las datos en segundo plano y los servicios de ubicación están desactivados."</string>
+    <string name="condition_battery_summary" msgid="4418839236027977450">"Ha disminuido el rendimiento. Las conexiones automáticas y los servicios de ubicación están desactivados."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Datos móviles desactivados"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet solo está disponible a través de redes Wi-Fi"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"Ahorro de datos activado"</string>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"Las datos en segundo plano solo están disponibles a través de redes Wi-Fi. Si la conexión Wi-Fi no está disponible, algunas aplicaciones o algunos servicios pueden verse afectados."</string>
+    <string name="condition_bg_data_summary" msgid="656957852895282228">"Las conexiones automáticas solo están disponibles a través de redes Wi-Fi. Si la conexión Wi-Fi no está disponible, algunas aplicaciones o algunos servicios pueden verse afectados."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabajo desactivado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Las aplicaciones, la sincronización en segundo plano y otras funciones relacionadas con tu perfil de trabajo están desactivadas."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Luz nocturna activada"</string>
@@ -3296,8 +3463,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,19 +3483,19 @@
       <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="restrict_background_blacklisted" msgid="3995443391711013068">"Las datos en segundo plano están desactivadas"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Datos no restringidos"</string>
+    <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Las conexiones automáticas están desactivadas"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activado"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desactivado"</string>
-    <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso no restringido de datos"</string>
+    <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso de datos sin restricción"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"No restringir datos si el ahorro de datos está activado"</string>
-    <string name="home_app" msgid="4066188520886810030">"Aplicación de página principal"</string>
+    <string name="home_app" msgid="4066188520886810030">"Aplicación de inicio"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Sin aplicación de inicio predeterminada"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Inicio seguro"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Solicitar un patrón para iniciar el dispositivo. Si el dispositivo está apagado, no puede recibir llamadas, mensajes, notificaciones ni alarmas."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Solicitar PIN para iniciar el dispositivo. Si el dispositivo está apagado, no puede recibir llamadas, mensajes, notificaciones ni alarmas."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Solicitar contraseña para iniciar el dispositivo. Si el dispositivo está apagado, no puede recibir llamadas, mensajes, notificaciones ni alarmas."</string>
-    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Añadir otra huella digital"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Añade otra huella digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloquear con un dedo diferente"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3400,11 +3565,11 @@
     <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Busca en la ayuda o vuelve durante nuestro horario de asistencia (hora local):&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">"Horario del servicio de asistencia telefónica (hora local)&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">"Busca en la Ayuda o consulta la sección Consejos y sugerencias"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Asistencia en:"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"Compatibilidad con:"</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">"¿Vas a viajar al extranjero?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Pueden aplicarse cargos internacionales."</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Pueden aplicarse cargos internacionales"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Teléfono"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Consulta la sección Consejos y sugerencias"</string>
@@ -3440,35 +3605,62 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"Auriculares"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"Periférico de entrada"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
-    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gestionar almacenamiento"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Administrar almacenamiento"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para liberar espacio, el Administrador de Almacenamiento borrará de tu dispositivo las fotos y vídeos que tengan copia de seguridad."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Borrar fotos y vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Administrador de Almacenamiento"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espacio"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Accesos directos de gestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar el teléfono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar el tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar el dispositivo"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Acceso rápido a la cámara"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Abrir cámara"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pulsa dos veces el botón de encendido para abrir la cámara rápidamente. Funciona desde cualquier pantalla."</string>
+    <!-- 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">"Cambiar de cámara"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar el teléfono dos veces para comprobarlo"</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">"Tocar el teléfono dos veces para comprobar notificaciones"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar el tablet dos veces para comprobar notificaciones"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar el dispositivo dos veces para comprobar notificaciones"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Toca dos veces la pantalla para consultar las notificaciones rápidamente."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar el teléfono para comprobarlo"</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">"Levantar el teléfono para comprobar las notificaciones"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar el tablet para comprobar las notificaciones"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar el dispositivo para comprobar las notificaciones"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Coge el teléfono para consultar las notificaciones rápidamente."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Coge el tablet para consultar las notificaciones rápidamente."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Coge el dispositivo para consultar las notificaciones rápidamente."</string>
+    <!-- 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">"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>
+    <!-- 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">"Levanta el teléfono para abrir la cámara"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir la cámara de forma automática, levanta el teléfono como si quisieras hacer una foto (en posición horizontal o vertical). Funciona cuando el teléfono está bloqueado o en suspensión."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Haz fotos cuando el teléfono esté bloqueado o en suspensión"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de asistencia"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidad"</string>
@@ -3572,6 +3764,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>
@@ -3585,5 +3778,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplicación instantánea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"¿Desactivar el administrador de almacenamiento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicaciones de películas y TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espacio usado"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Información de servicios del operador"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar servicios del operador"</string>
+    <!-- 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-et/arrays.xml b/res/values-et/arrays.xml
index d8534ad..fdba453 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Hea"</item>
     <item msgid="8986346415847956850">"Suurepärane"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Alati"</item>
-    <item msgid="844721238536786870">"Ainult siis, kui on ühendatud"</item>
-    <item msgid="1986753720941888596">"Mitte kunagi"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Alati"</item>
-    <item msgid="7433294150916905997">"Ainult siis, kui on ühendatud"</item>
-    <item msgid="1390404486722375028">"Mitte kunagi"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Viimased 30 päeva"</item>
     <item msgid="6600989128423965319">"Kas. tsükli määramine ..."</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 3683706..e73294a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Keela"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Sule"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Lüliti"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Tundmatu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Olete nüüd <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> sammu kaugusel arendajastaatusest.</item>
       <item quantity="one">Olete nüüd <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> sammu kaugusel arendajastaatusest.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Teil ei ole luba Bluetoothi seadete muutmiseks."</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> on läheduses olevatele seadmetele nähtav, kui Bluetoothi seaded on avatud."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Teie seadmed"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Kuupäev ja kellaaeg"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Ajavööndi valimine"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontod"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Asukoht"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontod"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Turvalisus ja asukoht"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Turvalisus ja asukoht"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Krüpteerimine ja mandaat"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon on krüpteeritud"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Seade on krüpteeritud"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registreerumist ei lõpetatud"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Sõrmejälje registreerimisaeg lõppes. Proovige uuesti."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Sõrmejälje registreerimine ei toiminud. Proovige uuesti või kasutage teist sõrme."</string>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Avamismustri muutmine"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuda avamise PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Avamisparooli muutmine"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Proovige uuesti. Katse <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Viimane katse"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Kui sisestate sellel katsel vale töömustri, eemaldatakse teie tööprofiil ja seotud andmed sellest seadmest."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Kui sisestate sellel katsel vale töö-PIN-koodi, eemaldatakse teie tööprofiil ja seotud andmed sellest seadmest."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Kui sisestate sellel katsel vale tööparooli, eemaldatakse teie tööprofiil ja seotud andmed sellest seadmest."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Liiga palju valesid katseid. Teie tööprofiil ja seotud andmed eemaldatakse sellest seadmest."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Loobu"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Proovige uuesti. Katse <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Teie andmed kustutatakse"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Kui sisestate järgmisel katsel vale mustri, kustutatakse selle seadme andmed"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Kui sisestate järgmisel katsel vale PIN-koodi, kustutatakse selle seadme andmed"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Kui sisestate järgmisel katsel vale parooli, kustutatakse selle seadme andmed"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Kui sisestate järgmisel katsel vale mustri, kustutatakse see kasutaja"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Kui sisestate järgmisel katsel vale PIN-koodi, kustutatakse see kasutaja"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Kui sisestate järgmisel katsel vale parooli, kustutatakse see kasutaja"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Kui sisestate järgmisel katsel vale mustri, kustutatakse teie tööprofiil ja selle andmed"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Kui sisestate järgmisel katsel vale PIN-koodi, kustutatakse teie tööprofiil ja selle andmed"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Kui sisestate järgmisel katsel vale parooli, kustutatakse teie tööprofiil ja selle andmed"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Liiga palju valesid katseid. Selle seadme andmed kustutatakse."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Liiga palju valesid katseid. See kasutaja kustutatakse."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Liiga palju valesid katseid. See tööprofiil ja selle andmed kustutatakse."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Loobu"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Peab sisaldama vähemalt <xliff:g id="COUNT">%d</xliff:g> tähemärki"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-kood peab sisaldama vähemalt <xliff:g id="COUNT">%d</xliff:g> numbrit"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jätka"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"Ü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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ruuteri turvaseadet (TKIP) ei toetata"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentimine ebaõnnestus. Proovige uuesti."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tuvastati teine WPS-i seanss. Proovige mõne minuti pärast uuesti."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"WiFi-võrgu ühendus katkestati. WPS-i seadistamine on tühistatud."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Võrgu nimi"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Sisestage SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Turvalisus"</string>
@@ -810,7 +873,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>
@@ -847,9 +909,28 @@
     <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>
+    <!-- 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_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">"Leviala sisselülitamine ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Leviala väljalülitamine ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivne"</string>
@@ -896,6 +977,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>
@@ -922,7 +1004,7 @@
     <string name="volume_media_description" msgid="7949355934788807863">"Muusika, video, mängud ja muu meedia"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Helin ja teated"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Teated"</string>
-    <string name="volume_alarm_description" msgid="8322615148532654841">"Äratused"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmid"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"Helinate ja teatiste summutamine"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"Muusika ja muude meediumide summutamine"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Teatiste summutamine"</string>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Algusaeg"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Lõppaeg"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Sees / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Ekraan aktiveerub, kui saate märguandeid"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Alati sees"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Näitamise aeg, märguande ikoonid ja muu teave"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Teksti suuremaks või väiksemaks muutmine"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaardi luku seaded"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Kustuta SD-kaart"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Sisemiselt USB-mäluseadmelt kõikide andmete (nt muusika või fotode) kustutamine"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD-kaardilt kõigi andmete (nt muusika või fotode) kustutamine"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Kustuta eSIM-kaardid"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Kustutab kõik telefonis olevad eSIM-kaardid. See ei tühista teie mobiilsideteenuse paketti."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Kustutab kõik tahvelarvutis olevad eSIM-kaardid. See ei tühista teie mobiilsideteenuse paketti."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Lähtesta tahvelarvuti"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Lähtesta telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Kas kustutada kõik teie isiklikud andmed ja allalaaditud rakendused? Seda toimingut ei saa tagasi võtta."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Töös"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-mäluseade"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD-kaardil"</string>
+    <string name="disabled" msgid="9206776641295849915">"Keelatud"</string>
     <string name="not_installed" msgid="2797554494953450291">"Pole selle kasutaja jaoks installitud"</string>
     <string name="installed" msgid="3070865169422600098">"Installitud"</string>
     <string name="no_applications" msgid="7336588977497084921">"Rakendusi pole."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"Keeled ja sisend"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Keeled ja sisend"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Sisestusabi"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Ekraan"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Taskulamp"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kaamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2183,7 +2343,7 @@
     <string name="untitled_apn" msgid="1230060359198685513">"Pealkirjata"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Üldine"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"Märguannete logi"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Kõne helin ja vibreerimine"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Kõne helin ja vibratsioon"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Süsteem"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"WiFi seadistamine"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g> ühenduse loomine"</string>
@@ -2654,17 +2814,20 @@
       <item quantity="one">Kuva %d peidetud üksus</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Võrk ja Internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"WiFi, mobiil, andmekasutus, leviala"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiil"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"andmekasutus"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"leviala"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Ühendatud seadmed"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, Cast"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Rakendused ja märguanded"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Load, vaikerakendused"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Kasutajad ja kontod"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Vaikerakendused"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Keeled, aeg, varundamine, värskendused"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Seaded"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Otsige seadetest"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Otsige seadetest"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Otsingu seaded"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Otsinguseaded"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, võrguühendus"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstsõnum, SMS-i saatmine, sõnumid, sõnumside"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiilne, mobiil, mobiilioperaator, juhtmeta, andmed, 4g,3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"liigutus"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"maksa, puuduta, maksed"</string>
     <string name="keywords_backup" msgid="470070289135403022">"varukoopia, varundamine"</string>
+    <!-- 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">"WiFi NFC-kiibi seadistamine"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjutamiseks puudutage kiipi ..."</string>
@@ -2723,7 +2892,7 @@
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Telefonihelin on seatud hääletuks"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Helina helitugevus on 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Meedia helitugevus"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Äratuse helitugevus"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmi helitugevus"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Helina helitugevus"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Märguande helitugevus"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefoni helin"</string>
@@ -2744,7 +2913,7 @@
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Ainult meedia heli"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"Hääletu"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Märguanne"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreerimine"</string>
+    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibratsioon"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Sisselülitamise helid"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Ükski automaatne reegel ei ole sisse lülitatud"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
@@ -2757,7 +2926,7 @@
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Režiimi Mitte segada reeglid"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Helid ja värinad on piiratud"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Ainult prioriteetsed"</string>
-    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ainult äratused"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ainult alarmid"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Täielik vaikus"</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">"Visuaalsete häirimiste blok."</string>
@@ -2833,8 +3002,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>
@@ -2862,7 +3029,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"Luba märguandetäpp"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Kuva märguandetäpp"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Funktsiooni Mitte segada alistamine"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Nendel märguannetel lubatakse teid jätkuvalt katkestada, kui funktsioon Mitte segada on määratud valikule Ainult prioriteetsed"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lubage nendel märguannetel teid jätkuvalt katkestada, kui funktsioon Mitte segada on määratud valikule Ainult prioriteetsed"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Lukustuskuval"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeeritud"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioriteet"</string>
@@ -2875,7 +3042,7 @@
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Kustuta"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Nimeta ümber"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Reegli nimi"</string>
-    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Sisestage reegli nimi"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Reegli nime sisestamine"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Reegli nimi on juba kasutusel"</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"Lisa veel"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Reegli kustutamine"</string>
@@ -2905,7 +3072,7 @@
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Puudub"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Iga päev"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Äratus võib lõppaja alistada"</string>
-    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Peata lõppajal või järgmise äratuse korral sõltuvalt sellest, kumb varem saabub."</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Peata lõppajal või järgmise äratuse korral sellest olenevalt, kumb varem saabub."</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> kuni <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -2917,7 +3084,7 @@
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Ainult kontaktidelt"</string>
     <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" msgid="2165302777886552926">"Alarmid"</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 +3132,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 +3139,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>
@@ -2996,7 +3158,7 @@
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Avamine ilma küsimata"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Toetatud lingid"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Muud vaikeseaded"</string>
-    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> kasutusel (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Tüübis <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> on kasutusel <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Sisemine salvestusruum"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Väline salvestusruum"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Rakenduse andmekasutus"</string>
@@ -3004,7 +3166,7 @@
     <string name="storage_used" msgid="7128074132917008743">"Kasutatud salvestusruum"</string>
     <string name="change" msgid="6657848623929839991">"Muuda"</string>
     <string name="change_storage" msgid="600475265207060436">"Salvestusruumi muutmine"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"Rakenduste märguanded"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"Rakenduse märguanded"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"Sees"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"Kõik on välja lülitatud"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> kategooriat <xliff:g id="COUNT_1">%2$d</xliff:g>-st on väljas"</string>
@@ -3044,7 +3206,7 @@
     <string name="configure_apps" msgid="6685680790825882528">"Rakenduste seadistamine"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tundmatu rakendus"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Rakenduste load"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"Rakendused, mis kasutavad: <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Rakendused, millel on rakenduse <xliff:g id="APPS">%1$s</xliff:g> luba"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Puudutusega äratamine"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Seadme äratamiseks topeltpuudutage ekraani"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Linkide avamine"</string>
@@ -3095,6 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Tundmatute rakenduste installimine"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Rakendustel süsteemiseadete muutmise lubamine"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Luba muuta süsteemiseadeid"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Luba võimaldab rakendusel muuta süsteemiseadeid."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Jah"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Luba sellest allikast"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Pöörake kaks korda kaamera avamiseks"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Avage kaamerarakendus, pöörates rannet kaks korda"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">1 rakendusel on lubatud kasutada piiranguteta andmemahtu, kui andmeside mahu säästja on sisse lülitatud</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Andmeside mahu säästja"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Piiranguteta juurdepääs andmesidele"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Piiramata andmed"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Taustaandmed on välja lülitatud"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Sees"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Väljas"</string>
@@ -3364,7 +3530,7 @@
     <string name="notification_log_details_parcel" msgid="243148037601903212">"paki suurus"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
     <string name="notification_log_details_sound" msgid="5506232879598808099">"heli"</string>
-    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibreerimine"</string>
+    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibratsioon"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"vaikeseade"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"puudub"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Asetuse objekt puudub."</string>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaatne"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Käsitsi"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Vabastage ruumi"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Liigutused"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Liigutuspõhised otseteed"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Kiirliigutused telefoni juhtimiseks"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Kiirliigutused tahvelarvuti juhtimiseks"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Kiirliigutused seadme juhtimiseks"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kaamera avamine"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kaamera kiireks avamiseks vajutage toitenuppu kaks korda. See töötab igal ekraanil."</string>
+    <!-- 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">"Kaamera vahetamine"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Tõstke kaamera avamiseks"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kaamera automaatseks avamiseks tõstke oma telefon foto jäädvustamise asendisse (maastiku- või portreevõte). Töötab ka siis, kui telefon on unerežiimis või lukustatud."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotode jäädvustamine unerežiimis või lukustatud telefoniga"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Abiliigutus"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Tundlikkus"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-eu/arrays.xml b/res/values-eu/arrays.xml
index 25c162d..8cf4ae8 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Ona"</item>
     <item msgid="8986346415847956850">"Bikaina"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Beti"</item>
-    <item msgid="844721238536786870">"Entxufatuta dagoenean soilik"</item>
-    <item msgid="1986753720941888596">"Inoiz ez"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Beti"</item>
-    <item msgid="7433294150916905997">"Entxufatuta dagoenean soilik"</item>
-    <item msgid="1390404486722375028">"Inoiz ez"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Azken 30 egunak"</item>
     <item msgid="6600989128423965319">"Erabilera-zikloa…"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 840384b..8635466 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Ukatu"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Itxi"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Aldatu"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Ezezaguna"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> urrats falta zaizkizu garatzaile izateko.</item>
       <item quantity="one"><xliff:g id="STEP_COUNT_0">%1$d</xliff:g> urrats falta zaizu garatzaile izateko.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Ez daukazu Bluetooth-ezarpenak aldatzeko baimenik."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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> 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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Zure gailuak"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontuak"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kokapena"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontuak"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Segurtasuna eta kokapena"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptatzea eta kredentzialak"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Enkriptatuta dago telefonoa"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Enkriptatuta dago gailua"</string>
@@ -354,40 +378,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +488,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>
@@ -483,20 +524,20 @@
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desakt. pant.-blokeoa"</string>
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Gailuaren babesa kendu nahi duzu?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Profilaren babes-sistema kendu nahi duzu?"</string>
-    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Eredua behar da gailuaren babes-eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Eredua behar da gailuaren babes-eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Eredua behar da gailua babesteko eginbideek funtziona dezaten."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Eredua behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Gordetako hatz-markak ere kenduko dira gailutik eta ezin izango duzu haiek gabe telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"PIN kodea behar da gailuaren babes-eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"PIN kodea behar da gailuaren babes-eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"PIN kodea behar da gailua babesteko eginbideek funtziona dezaten."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"PIN kodea behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Gordetako hatz-markak ere kenduko dira gailutik eta ezin izango duzu haiek gabe telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
-    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Pasahitza behar da gailuaren babes-eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Pasahitza behar da gailuaren babes-eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Pasahitza behar da gailua babesteko eginbideek funtziona dezaten."</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Pasahitza behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Gordetako hatz-markak ere kenduko dira gailutik eta ezin izango duzu haiek gabe telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
-    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Pantailaren blokeoa kodea behar da gailuaren babes-eginbideek funtziona dezaten."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Pantailaren blokeoa behar da gailuaren babes-eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Pantailaren blokeoa kodea behar da gailua babesteko eginbideek funtziona dezaten."</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Pantailaren blokeoa behar da gailua babesteko eginbideek funtziona dezaten.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Gordetako hatz-markak ere kenduko dira gailutik eta ezin izango duzu haiek gabe telefonoa desblokeatu, erosketarik baimendu edo aplikazioetan saioa hasi.\""</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Eredua behar da profila babesteko eginbideek funtziona dezaten."</string>
@@ -519,13 +560,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">"Ezabatu egingo dira datuak"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Hurrengo saiakeran eredua oker marrazten baduzu, ezabatu egingo dira gailuko datuak"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Hurrengo saiakeran PIN kodea oker idazten baduzu, ezabatu egingo dira gailuko datuak"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Hurrengo saiakeran pasahitza oker idazten baduzu, ezabatu egingo dira gailuko datuak"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Hurrengo saiakeran eredua oker marrazten baduzu, ezabatu egingo da erabiltzailea"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Hurrengo saiakeran PIN kodea oker idazten baduzu, ezabatu egingo da erabiltzailea"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Hurrengo saiakeran pasahitza oker idazten baduzu, ezabatu egingo da erabiltzailea"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Hurrengo saiakeran eredua oker marrazten baduzu, ezabatu egingo dira laneko profila eta bertako datuak"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Hurrengo saiakeran PIN kodea oker idazten baduzu, ezabatu egingo dira laneko profila eta bertako datuak"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Hurrengo saiakeran pasahitza oker idazten baduzu, ezabatu egingo dira laneko profila eta bertako datuak"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Saiakera oker gehiegi egin dituzu. Ezabatu egingo dira gailu honetako datuak."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Saiakera oker gehiegi egin dituzu. Ezabatu egingo da erabiltzailea."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Saiakera oker gehiegi egin dituzu. Ezabatu egingo dira laneko profila eta bertako datuak."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Baztertu"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Gutxienez <xliff:g id="COUNT">%d</xliff:g> karaktere izan behar ditu"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Gutxienez <xliff:g id="COUNT">%d</xliff:g> digitu izan behar ditu PIN kodeak"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jarraitu"</string>
@@ -626,6 +675,22 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth ezarpen aurreratuak"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth eginbidea gaituta badago, inguruko Bluetooth gailuekin komunika daiteke gailua."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Kokapenaren zehaztasuna hobetzeko, sistemaren aplikazioek eta zerbitzuek Bluetooth gailuak hautematen jarraituko dute. Hori aldatzeko, zoaz <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>gailuak bilatzeko ezarpenetara<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <!-- 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">"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>
@@ -747,7 +812,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Hari gabeko bideratzailearen segurtasun-ezarpena (TKIP) ez dago onartuta."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ezin izan da autentifikatu. Saiatu berriro."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Beste WPS saio bat detektatu da. Saiatu berriro minutu batzuk igarotakoan."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi saretik deskonektatu da. Bertan behera utzi da WPSaren konfigurazioa."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Sarearen izena"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Idatzi SSIDa"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurtasuna"</string>
@@ -810,7 +874,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 +910,28 @@
     <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>
+    <!-- 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_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">"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 +978,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>
@@ -923,7 +1006,7 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"Tonua eta jakinarazpenak"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Jakinarazpenak"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmak"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"Desaktibatu tonuaren eta jakinarazpenen audioa"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Desaktibatu dei-tonuaren eta jakinarazpenen audioa"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"Desaktibatu musikaren eta beste multimedia-elementuen audioa."</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Desaktibatu jakinarazpenen audioa"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Desaktibatu alarmen audioa."</string>
@@ -980,23 +1063,33 @@
     <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>
+    <!-- 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">"Hasiera-ordua"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Amaiera-ordua"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Aktibatuta / <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">"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>
@@ -1009,19 +1102,30 @@
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Pantaila-babeslea"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Kargatzen ari denean edo oinarrira konektatuta dagoenean"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bietako edozein"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Kargatzen ari denean"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Kargatu bitartean"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Oinarrira konektatuta dagoenean"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Inoiz ez"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desaktibatuta"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Telefonoa oinarrira konektatuta edo lo dagoenean zer gertatzen den kontrolatzeko, aktiba ezazu pantaila-babeslea."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Noiz abiarazi"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Uneko pantaila-babeslea"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Abiarazi"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Erabili"</string>
     <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>
+    <!-- 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">"Argitu pantaila jakinarazpenak jasotzen dituzunean"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Beti aktibatuta"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Erakutsi ordua, jakinarazpenen ikonoak eta bestelako informazioa"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Letra-tipoaren tamaina"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Handitu edo txikitu testua"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM txartelaren blokeo-ezarpenak"</string>
@@ -1273,6 +1377,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APNak ezin du hutsik egon."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC eremuak 3 digitu izan behar ditu."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC eremuak 2 edo 3 digitu izan behar ditu."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Operadoreak ez du onartzen %s motako APN identifikatzailerik."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"APN ezarpen lehenetsiak leheneratzen."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Berrezarri balio lehenetsiak"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN ezarpen lehenetsiak berrezarri dira."</string>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ezabatu SD txartela"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ezabatu barneko USB memoriako datu guztiak, adibidez, musika edo argazkiak"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ezabatu SD txarteleko datu guztiak, besteak beste, musika edo argazkiak."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Ezabatu eSIM txartelak"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ezabatu telefonoko eSIM txartel guztiak. Ez da bertan behera utziko zerbitzu mugikorraren plana."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ezabatu tabletako eSIM txartel guztiak. Ez da bertan behera utziko zerbitzu mugikorraren plana."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Berrezarri tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Berrezarri telefonoa"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatu nahi dituzu? Ekintza hori ezin da desegin."</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,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>
@@ -1491,6 +1593,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1658,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Abian"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB memoria"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD txartelean"</string>
+    <string name="disabled" msgid="9206776641295849915">"Desgaituta"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ez dago instalatuta erabiltzaile honentzat"</string>
     <string name="installed" msgid="3070865169422600098">"Instalatuta"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ez dago aplikaziorik."</string>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
+    <!-- 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">"Pantaila"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Linterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2111,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2164,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2183,7 +2344,7 @@
     <string name="untitled_apn" msgid="1230060359198685513">"Izengabea"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Orokorra"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"Jakinarazpenen erregistroa"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tonua eta dardara"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Dei-tonua eta dardara"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"Wi‑Fi konfigurazioa"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Konektatu <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi‑Fi sarera"</string>
@@ -2284,7 +2445,7 @@
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"APLIKAZIOEN INFORMAZIOA"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Datu-konexioa"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Ezarri datuen muga"</string>
-    <string name="data_usage_cycle" msgid="5652529796195787949">"Datuen erabilera-zikloa"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Datu-erabileraren zikloa"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Aplikazioen erabilera"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Ibiltaritzako datuak"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Mugatu atzeko planoko datuak"</string>
@@ -2303,7 +2464,7 @@
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Sinkr. datu pertsonalak auto."</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Sinkr. laneko datuak auto."</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Aldatu zikloa…"</string>
-    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Datuen erabilera-zikloa berrezarri beharreko hilabeteko eguna:"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Datu-erabileraren zikloa berrezarri beharreko hilabeteko eguna:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Ez dago epean daturik erabili duen aplikaziorik."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Aurreko planoa"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Atzeko planoa"</string>
@@ -2340,8 +2501,8 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Erabilera-zikloa berrezartzeko data"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Hilabete bakoitzeko eguna:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ezarri"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ezarri datuen erabilera-abisua"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ezarri datuen erabilera-muga"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ezarri datu-erabileraren abisua"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ezarri datu-erabileraren muga"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datuen erabilera mugatzea"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Zehaztu duzun mugara iristean, tabletak desaktibatu egingo du datu-konexioa.\n\nZentzuzko muga bat ezartzea gomendatzen dizugu, datuen erabilera tabletak neurtuko duelako eta litekeena delako operadoreak datuak bestela neurtzea."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Zehaztu duzun mugara iristean, telefonoak desaktibatu egingo du datu-konexioa.\n\nZentzuzko muga bat ezartzea gomendatzen dizugu, datuen erabilera telefonoak neurtuko duelako eta litekeena delako operadoreak datuak bestela neurtzea."</string>
@@ -2654,17 +2815,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplikazio lehenetsiak"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Hizkuntzak, ordua, babeskopiak, eguneratzeak"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ezarpenak"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Bilatu ezarpenetan"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Bilatu ezarpenetan"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Bilaketa-ezarpenak"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Bilaketa-ezarpenak"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, sare, konexio"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"testu-mezua, testu-mezuak, mezuak, bidali"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"sare mugikorrak, operadorea, hari gabeko konexioak, datuak, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2873,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"keinua"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ordaindu, ukitu, ordainketak"</string>
     <string name="keywords_backup" msgid="470070289135403022">"babeskopia, segurtasun kopia"</string>
+    <!-- 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">"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>
@@ -2726,7 +2896,7 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmaren bolumena"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Tonuaren bolumena"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Jakinarazpenen bolumena"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Telefonoaren tonua"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Telefonoaren tonu-jotzailea"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Jakinarazpenen soinu lehenetsia"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Aplikazioaren soinua"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"Jakinarazpenen soinu lehenetsia"</string>
@@ -2734,7 +2904,7 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Egin dar-dar deietan ere"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Beste soinu batzuk"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Markagailuaren tonuak"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Pantaila blokeatzearen soinuak"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Pantaila blokeatzearen soinua"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"Kargatzearen soinuak"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Oinarrira konektatzearen soinua"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Ukipen-soinuak"</string>
@@ -2743,7 +2913,7 @@
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Audio guztia"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Multimedia-edukiaren audioa bakarrik"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"Isilik"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Abisua"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alertak"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dar-dar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Pizteko soinuak"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Ez dago arau automatikorik aktibatuta"</string>
@@ -2778,7 +2948,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Jakinarazpenak"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Ezarpen aurreratuak"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Laneko jakinarazpenak"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"Baimendu jakinarazteko biribiltxoak"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Baimendu jakinarazteko biribiltxoak erakustea"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Argi keinukaria"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pantaila blokeatuan"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Erakutsi jakinarazpenen eduki guztia"</string>
@@ -2827,14 +2997,12 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Gailua EB moduan dagoenean"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Murriztu lausotzea (gomendatua)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Murriztu distira"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Pantaila txiki gainjarria"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Ez dago instalatuta pantaila txiki gainjarriarekin bateragarria den aplikaziorik"</string>
-    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pantaila txiki gainjarria"</string>
-    <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="picture_in_picture_title" msgid="5824849294270017113">"Pantaila txikia"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Ez dago instalatuta pantaila txikiarekin bateragarria den aplikaziorik"</string>
+    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pantaila txikia"</string>
+    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantaila txikia"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Baimendu pantaila txikia erabiltzea"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Baimendu aplikazio honek pantaila txiki bat sortzea aplikazioa irekita dagoenean edo handik irtetean (adibidez, bideoak ikusten jarraitzeko). Erabiltzen ari zaren beste aplikazioen gaienean bistaratzen da leiho hori."</string>
     <string name="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>
@@ -2862,7 +3030,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"Baimendu jakinarazteko biribiltxoa erakustea"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Erakutsi jakinarazteko biribiltxoa"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Ez molestatu\" moduaren salbuespenak"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Baimendu jakinarazpen hauei jarduerak etetea \"Ez molestatu\" aukera Lehentasunezkoak soilik gisa ezarrita dagoenean"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Baimendu jakinarazpenek jarduera etenaraztea \"Ez molestatu\" aukera Lehentasunezkoak soilik gisa ezarrita dagoenean"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pantaila blokeatuan"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeatuta"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Lehentasuna"</string>
@@ -2887,7 +3055,7 @@
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Konfiguratu araua"</string>
     <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Denbora-tartearen araua"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Une jakin batzuetan \"Ez molestatu\" egoera aktibatzen duen arau automatikoa"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Gertaeraren araua"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Egoeraren araua"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Egoera jakin batzuetan \"Ez molestatu\" egoera aktibatzen duen arau automatikoa"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Hemengo gertaerek dirauten bitartean"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"<xliff:g id="CALENDAR">%1$s</xliff:g> egutegiko gertaerek dirauten bitartean"</string>
@@ -2914,8 +3082,8 @@
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Mezu guztiak"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Hautatutako mezuak"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Edonorenak"</string>
-    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Kontaktuenak soilik"</string>
-    <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kontaktu izardunenak soilik"</string>
+    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Kontaktuetakoak soilik"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kontaktu izardunetakoak 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_reminders" msgid="5458502056440485730">"Abisuak"</string>
@@ -2965,11 +3133,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 +3140,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>
@@ -2996,7 +3159,7 @@
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Ireki galdetu gabe"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Onartzen diren estekak"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Beste aplikazio lehenetsi batzuk"</string>
-    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> erabilita (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Erabilitako lekua: <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Barneko memoria"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Kanpoko memoria"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Aplikazioak erabilitako datuak"</string>
@@ -3044,7 +3207,7 @@
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguratu aplikazioak"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikazio ezezaguna"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Aplikazio-baimenak"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> atzitzeko baimena duten aplikazioak"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Baimen hauek dituzten aplikazioak: <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Sakatu aktibatzeko"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Sakatu birritan pantailako edozein puntu gailua aktibatzeko"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Irekiko diren estekak"</string>
@@ -3069,7 +3232,7 @@
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Onartu"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Ez onartu"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Aukeratu ahots-idazketa aplik."</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"Arakatzailea"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Arakatzailearen aplikazioa"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Ez dago arakatzailerik lehenetsita"</string>
     <string name="default_phone_title" msgid="282005908059637350">"Telefonoa aplikazioa"</string>
     <string name="default_app" msgid="6864503001385843060">"(lehenetsia)"</string>
@@ -3095,6 +3258,12 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Erabilera-abisuak"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Erakutsi gailuaren erabilera guztia"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Erakutsi aplikazioaren erabilera"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Bateria asko ari da erabiltzen"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikazio ez dira ari behar bezala funtzionatzen</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ez da ari behar bezala funtzionatzen</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3356,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalatu aplikazio ezezagunak"</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>
@@ -3200,8 +3370,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Aplikazioek sistemaren ezarpenak aldatzeko baimena"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Baimendu sistemaren ezarpenak aldatzea"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Baimen honekin, sistemaren ezarpenak alda ditzakete aplikazioek."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Bai"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Ez"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Baimendu iturburu hau"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera irekitzeko, biratu birritan"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Ireki kameraren aplikazioa eskumuturra birritan biratuta"</string>
@@ -3296,8 +3464,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Datuen erabileraren abisua: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Datuen erabileraren abisua: <xliff:g id="ID_1">%1$s</xliff:g>. Datuen muga: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturazio-zikloa"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Hileroko zikloa hilabete bakoitzeko <xliff:g id="ID_1">%1$s</xliff:g>. egunean hasiko da"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hilero, <xliff:g id="ID_1">%1$s</xliff:g>. egunetik hasita"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Hilean behin, <xliff:g id="ID_1">%1$s</xliff:g>. egunean"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Sarearen murriztapenak"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> murriztapen</item>
@@ -3317,7 +3484,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>
@@ -3369,7 +3536,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"bat ere ez"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Sailkapen-objektua falta da."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Sailkapen-objektuak ez du gako hau."</string>
-    <string name="special_access" msgid="3458780842491881155">"Aplikazio-baimen bereziak"</string>
+    <string name="special_access" msgid="3458780842491881155">"Aplikazioen baimen bereziak"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikaziok dute datuak mugarik gabe erabiltzeko aukera</item>
       <item quantity="one">1 aplikaziok du datuak mugarik gabe erabiltzeko aukera</item>
@@ -3382,7 +3549,6 @@
     <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="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>
@@ -3447,28 +3613,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatikoa"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Eskuzko ezarpenak"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Egin tokia"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Keinuak"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Keinu bidezko lasterbideak"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonoa kontrolatzeko keinuak"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Tableta kontrolatzeko keinu bizkorrak"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gailua kontrolatzeko keinu bizkorrak"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ireki kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamera bizkor irekitzeko, sakatu birritan etengailua. Edozein pantailatan zaudela egin dezakezu hori."</string>
+    <!-- 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">"Biratu kamera"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Jaso telefonoa kamera irekitzeko"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kamera automatikoki irekitzeko, jaso telefonoa argazkiak ateratzeko posiziora (horizontalki nahiz bertikalki). Telefonoa inaktibo edo blokeatuta dagoenean ere funtzionatzen du."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Atera argazkiak telefonoa inaktibo edo blokeatuta dagoenean"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Laguntza aktibatzeko keinua"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sentikortasuna"</string>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-fa/arrays.xml b/res/values-fa/arrays.xml
index 32ca0b7..cd8b986 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"خوب"</item>
     <item msgid="8986346415847956850">"عالی"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"همیشه"</item>
-    <item msgid="844721238536786870">"تنها زمانی که وصل است"</item>
-    <item msgid="1986753720941888596">"هیچ‌وقت"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"همیشه"</item>
-    <item msgid="7433294150916905997">"تنها زمانی که وصل است"</item>
-    <item msgid="1390404486722375028">"هیچ‌وقت"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"۳۰ روز گذشته"</item>
     <item msgid="6600989128423965319">"تنظیم چرخه مصرف..."</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 37a53c3..f4371f5 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -23,13 +23,13 @@
     <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="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="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 +41,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 +107,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">"اجازه ندارید تنظیمات بلوتوث را تغییر دهید."</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> برای دستگاه‌های اطراف قابل مشاهده است."</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- 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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
+    <!-- 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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"تغییر الگوی بازگشایی قفل"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغییر پین بازگشایی قفل"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغییر گذرواژه قفل‌گشا"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"دوباره امتحان کنید. تلاش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"آخرین تلاش"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"اگر در این تلاش الگوی کاری نادرستی وارد کنید، نمایه کاری‌تان و داده‌های مرتبط با آن از این دستگاه پاک خواهد شد."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"اگر در این تلاش پین کاری نادرستی وارد کنید، نمایه کاری‌تان و داده‌های مرتبط با آن از این دستگاه پاک خواهد شد."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"اگر در این تلاش گذرواژه کاری نادرستی وارد کنید، نمایه کاری‌تان و داده‌های مرتبط با آن از این دستگاه پاک خواهد شد."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"تلاش‌های نادرست بسیاری انجام شده است. نمایه کاری‌تان و داده‌های مرتبط با آن از این دستگاه حذف خواهد شد."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"رد کردن"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"دوباره امتحان کنید. تلاش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"داده‌هایتان حذف خواهد شد"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"اگر در تلاش بعدی الگوی نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"اگر در تلاش بعدی‌ پین نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"اگر در تلاش بعدی‌ گذرواژه نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"اگر در تلاش بعدی‌ الگوی نادرستی وارد کنید، این کاربر حذف خواهد شد"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"اگر در تلاش بعدی‌ پین نادرستی وارد کنید، این کاربر حذف خواهد شد"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"اگر در تلاش بعدی گذرواژه نادرستی وارد کنید، این کاربر حذف خواهد شد"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"اگر در تلاش بعدی الگوی نادرستی وارد کنید، داده‌های نمایه کاری شما و داده‌های آن حذف خواهد شد"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"اگر در تلاش بعدی‌ پین نادرستی وارد کنید، نمایه کاری شما و داده‌های آن حذف خواهند شد"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"اگر در تلاش بعدی‌ گذرواژه نادرستی وارد کنید، نمایه کاری شما و داده‌های آن حذف خواهند شد"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"تلاش‌های اشتباه بسیار زیادی انجام شده است. داده‌های این دستگاه حذف خواهد شد."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"تلاش‌های اشتباه بسیار زیادی انجام شده است. این کاربر حذف خواهد شد."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"تلاش‌های اشتباه بسیار زیادی انجام شده است. این نمایه کاری و داده‌های آن‌ حذف خواهند شد."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"نپذیرفتن"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"باید حداقل <xliff:g id="COUNT">%d</xliff:g> نویسه داشته باشد"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"پین باید حداقل <xliff:g id="COUNT">%d</xliff:g> رقم داشته باشد"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ادامه"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -737,17 +801,16 @@
     <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_msg" msgid="315174329121275092">"‏راه‌اندازی WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"‏دکمه راه‌اندازی حفاظت‌شده Wi‑Fi را در رهیاب فشار دهید. این دکمه ممکن است Wi‑Fi Protected Setup یا WPS نامیده شود یا دارای این نماد باشد:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"‏دکمه راه‌اندازی حفاظت‌شده Wi‑Fi را در رهیابتان فشار دهید. این دکمه ممکن است Wi‑Fi Protected Setup یا WPS نامیده شود یا دارای این نماد باشد:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"‏پین <xliff:g id="NUMBER">%1$s</xliff:g> را در رهیاب Wi-Fi خود وارد کنید. تکمیل نصب ممکن است تا دو دقیقه طول بکشد."</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_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_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_ssid" msgid="5519636102673067319">"نام شبکه"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"‏SSID را وارد کنید"</string>
     <string name="wifi_security" msgid="6603611185592956936">"امنیت"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"در حال روشن کردن نقطه اتصال…"</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"تنظیمات قفل سیم کارت"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏پاک کردن کارت SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏همه داده‌های موجود در حافظهٔ USB داخلی مانند موسیقی یا عکس‌ها را پاک کنید"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏همه داده‌های موجود در کارت SD از جمله موسیقی یا عکس‌ها حذف می‌شوند"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"‏پاک کردن eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‏همه کارت‌های eSIM را در تلفن پاک کنید. با این کار طرح سرویس همراهتان لغو نخواهد شد."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‏همه کارت‌های eSIM را در رایانه لوحی پاک کنید. با این کار طرح سرویس همراهتان لغو نخواهد شد."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"بازنشانی رایانهٔ لوحی"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"بازنشانی تلفن"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"همه اطلاعات شخصی و برنامه‌های دانلودشده پاک شود؟ امکان واگرد این کار وجود ندارد!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"‏در کارت SD"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"کمک برای ورودی"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"‏مقدار کل CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏پیش زمینه CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار باش"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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="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>
@@ -2569,8 +2729,8 @@
     <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>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"دریافت هشدار برای تهدیدهای جدی جانی و مالی"</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="amber_alerts_summary" msgid="4312984614037904489">"دریافت بولتن‌های مربوط به کودک‌ربایی"</string>
     <string name="repeat_title" msgid="6473587828597786996">"تکرار"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"‏شبکه همراه، دستگاه همراه، شرکت مخابراتی تلفن همراه، بی‌سیم، داده 4g،‏ 3g،‏ 2g،‏ lte"</string>
@@ -2709,6 +2872,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">"‏تنظیم برچسب NFC برای Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ضربه زدن روی یک برچسب برای نوشتن..."</string>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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>
@@ -3062,7 +3224,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 +3257,12 @@
     <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>
+    <!-- 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>
@@ -3187,8 +3355,9 @@
     <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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"مجاز از این منبع"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"دو بار بچرخانید تا دوربین باز شود"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"با دو بار چرخاندن مچتان، برنامه دوربین را باز کنید"</string>
@@ -3240,7 +3407,7 @@
     <string name="display_summary_example" msgid="9102633726811090523">"خواب پس از ۱۰ دقیقه عدم فعالیت"</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>
     <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="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>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="developer_smallest_width" msgid="7516950434587313360">"کوچک‌ترین عرض"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"هیچ برنامه نصب‌شده‌ای دسترسی به «پیامک ویژه» را درخواست نکرده است"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ممکن است استفاده از «پیامک ویژه» برای شما هزینه داشته باشد و مبلغ صورت‌حساب‌های شرکت مخابراتی‌تان را افزایش دهد. اگر مجوز را برای برنامه‌ای فعال کنید، می‌توانید با استفاده از آن برنامه پیامک ویژه ارسال کنید."</string>
@@ -3447,28 +3612,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-fi/arrays.xml b/res/values-fi/arrays.xml
index 88cea35..7ce271b 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Hyvä"</item>
     <item msgid="8986346415847956850">"Erinomainen"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Aina"</item>
-    <item msgid="844721238536786870">"Vain, kun laturi on kytketty"</item>
-    <item msgid="1986753720941888596">"Ei koskaan"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Aina"</item>
-    <item msgid="7433294150916905997">"Vain, kun laturi on kytketty"</item>
-    <item msgid="1390404486722375028">"Ei koskaan"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 viime päivää"</item>
     <item msgid="6600989128423965319">"Aseta käyttöjakso…"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5c3cd4f..6cd20dd 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Hylkää"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Sulje"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Vaihda"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Tuntematon"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Enää <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> vaihetta, niin sinusta tulee kehittäjä.</item>
       <item quantity="one">Enää <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> vaihe, niin sinusta tulee kehittäjä.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Sinulla ei ole lupaa muuttaa Bluetooth-asetuksia."</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> näkyy lähellä olevissa laitteissa, kun Bluetooth-asetukset on auki."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Omat laitteet"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Vaihda lukituksenpoistokuvio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Vaihda lukituksen poiston salasana"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Yritä uudelleen. Yritys <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Viimeinen yritys"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jos annat väärän työprofiilin kuvion tällä yrityskerralla, työprofiilisi ja siihen liittyvät tiedot poistetaan tältä laitteelta."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jos annat väärän työprofiilin PIN-koodin tällä yrityskerralla, työprofiilisi ja siihen liittyvät tiedot poistetaan tältä laitteelta."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jos annat väärän työprofiilin salasanan tällä yrityskerralla, työprofiilisi ja siihen liittyvät tiedot poistetaan tältä laitteelta."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Liian monta virheellistä yritystä. Työprofiilisi ja siihen liittyvät tiedot poistetaan tältä laitteelta."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Hylkää"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Yritä uudelleen. Yritys <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Tietosi poistetaan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jos annat väärän kuvion seuraavalla yrityskerralla, laitteen tiedot poistetaan."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jos annat väärän PIN-koodin seuraavalla yrityskerralla, laitteen tiedot poistetaan."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jos annat väärän salasanan seuraavalla yrityskerralla, laitteen tiedot poistetaan."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jos annat väärän kuvion seuraavalla yrityskerralla, tämä käyttäjä poistetaan."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jos annat väärän PIN-koodin seuraavalla yrityskerralla, tämä käyttäjä poistetaan."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jos annat väärän salasanan seuraavalla yrityskerralla, tämä käyttäjä poistetaan."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jos annat väärän kuvion seuraavalla yrityskerralla, työprofiilisi ja sen tiedot poistetaan."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jos annat väärän PIN-koodin seuraavalla yrityskerralla, työprofiilisi ja sen tiedot poistetaan."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jos annat väärän salasanan seuraavalla yrityskerralla, työprofiilisi ja sen tiedot poistetaan."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Liian monta virheellistä yritystä. Laitteen tiedot poistetaan."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Liian monta virheellistä yritystä. Tämä käyttäjä poistetaan."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Liian monta virheellistä yritystä. Tämä työprofiili ja sen tiedot poistetaan."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Hylkää"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Salasanan vähimmäispituus on <xliff:g id="COUNT">%d</xliff:g> merkkiä."</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-koodin vähimmäispituus on <xliff:g id="COUNT">%d</xliff:g> merkkiä."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jatka"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Langattoman reitittimen suojausasetusta (TKIP) ei tueta."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Todennusvirhe. Yritä myöhemmin uudelleen."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Havaittiin toinen WPS-käyttökerta. Yritä uudelleen muutaman minuutin kuluttua."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi-yhteys katkaistu. WPS:n määritys peruutettu."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Verkon nimi"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Anna SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Suojaus"</string>
@@ -810,7 +873,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>
@@ -847,9 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Alkamisaika"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Päättymisaika"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Päällä / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Aktivoi näyttö, kun saat ilmoituksia."</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Aina käytössä"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Näytä aika, ilmoitukset, kuvakkeet ja muut tiedot."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Suurenna tai pienennä tekstiä."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kortin lukitusasetukset"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Tyhjennä SD-kortti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai valokuvat."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Poista kaikki SD-kortin tiedot, kuten musiikki tai valokuvat."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Tyhjennä eSIMit"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Tyhjennä kaikki puhelimen eSIMit. Tämä ei peruuta mobiilipalvelupakettiasi."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Tyhjennä kaikki tabletin eSIMit. Tämä ei peruuta mobiilipalvelupakettiasi."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Palauta tablet-laitteen tehdasasetukset"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Nollaa puhelimen asetukset"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Haluatko poistaa kaikki henkilökohtaiset tietosi ja lataamasi sovellukset? Toimintoa ei voi peruuttaa."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Käynnissä"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-tallennustila"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD-kortilla"</string>
+    <string name="disabled" msgid="9206776641295849915">"Pois käytöstä"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ei asennettu tälle käyttäjälle"</string>
     <string name="installed" msgid="3070865169422600098">"Asennettu"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ei sovelluksia."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Näyttö"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Taskulamppu"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Oletussovellukset"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Kielet, aika, varmuuskopiointi, päivitykset"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Asetukset"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Hae asetuksista"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Hae asetuksista"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Hakuasetukset"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Hakuasetukset"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, verkkoyhteys"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstiviesti, tekstiviestien lähetys, viestit, viestien lähetys"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"matkapuhelin, mobiili, puhelinoperaattori, langaton, tiedonsiirto, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"eleet"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"maksa, napauta, maksut"</string>
     <string name="keywords_backup" msgid="470070289135403022">"varmuuskopiointi, varmuuskopio"</string>
+    <!-- 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">"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>
@@ -2783,7 +2952,7 @@
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Lukitusnäytöllä"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Näytä ilmoitusten koko sisältö."</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Piilota henkilökohtainen ilmoitussisältö."</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Älä näytä ilmoituksia lainkaan"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Älä näytä ilmoituksia lainkaan."</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Miten haluat ilmoitusten näkyvän, kun laite on lukittu?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Ilmoitukset"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Näytä kaikki työilmoitussisältö"</string>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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>
@@ -3043,8 +3205,8 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Lisäasetukset"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Sovellusten konfigurointi"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tuntematon sovellus"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"Sovellusten käyttöoikeudet"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"Sovellukset, joilla on lupa käyttää seuraavia: <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Sovelluksen käyttöoikeudet"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Sovellukset, joilla on käyttöoikeus <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Herätä napauttamalla"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Herätä laite napauttamalla näyttöä kahdesti."</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Linkkien avautuminen"</string>
@@ -3095,6 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Tuntemattomien sovellusten asentaminen"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Sovelluksen järjestelmäasetusten muokkausoikeus"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Salli järjestelmäasetusten muokkaaminen"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Tämä käyttöoikeus sallii sovelluksen muokata järjestelmäasetuksia."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Kyllä"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Salli tästä lähteestä"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kaksoiskääntäminen kameraa varten"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Avaa kamerasovellus kääntämällä rannettasi kahdesti"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaattinen"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuaalinen"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Vapauta tilaa"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Eleet"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Pikakäyttöliikkeet"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Puhelin ohjaamisen pikaeleet"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Tabletin ohjaamisen pikaeleet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Laitten ohjaamisen pikaeleet"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraan siirtyminen"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Avaa kamera nopeasti painamalla virtapainiketta kahdesti. Tämä toimii miltä tahansa näytöltä."</string>
+    <!-- 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">"Kameran vaihtaminen"</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">"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>
+    <!-- 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">"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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Pyyhkäise ilmoitukset esiin"</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">"Näytä ilmoitukset pyyhkäisemällä sormenjälkitunnistinta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Voit katsoa ilmoitukset pyyhkäisemällä puhelimen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Voit katsoa ilmoitukset pyyhkäisemällä tabletin takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Voit katsoa ilmoitukset pyyhkäisemällä laitteen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
+    <!-- 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">"Avaa kamera nostamalla"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Avaa kamera automaattisesti nostamalla puhelin kuvanottoasentoon (vaaka- tai pystysuunnassa). Tämä toimii, kun puhelin on lepotilassa tai lukittu."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ota kuvia, kun puhelin on lepotilassa tai lukittu."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Apuele"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Herkkyys"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 7de3854..c58e1f7 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bonne"</item>
     <item msgid="8986346415847956850">"Excellente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Toujours"</item>
-    <item msgid="844721238536786870">"Uniquement si l\'appareil ebranché"</item>
-    <item msgid="1986753720941888596">"Jamais"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Toujours"</item>
-    <item msgid="7433294150916905997">"Uniquement si l\'appareil ebranché"</item>
-    <item msgid="1390404486722375028">"Jamais"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 derniers jours"</item>
     <item msgid="6600989128423965319">"Défin. du cycle d\'util..."</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ad7ab23..1f3eb34 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Refusers"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fermer"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Changer"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Plus qu’<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir un développeur.</item>
       <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir un développeur.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Position"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sécurité et localisation"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sécurité et localisation"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cryptage et authentifiants"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Téléphone crypté"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Appareil crypté"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'enregistrement n\'est pas terminé"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Le temps attribué pour l\'enregistrement des empreintes digitales est écoulé. Veuillez essayer de nouveau."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement des empreintes digitales ne fonctionne pas. Essayez à nouveau ou utilisez un autre doigt."</string>
@@ -449,6 +487,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choisissez votre méthode secondaire de verrouillage d\'écran"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Options de verrouillage de l\'écran"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Options de verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / immédiatement après la mise en veille"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / après <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> de veille"</string>
@@ -519,13 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Modifier le schéma"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le NIP de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Réessayez. Tentative <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> sur <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Dernière tentative"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si vous entrez un schéma professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si vous entrez un NIP professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si vous entrez un mot de passe professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Trop de tentatives incorrectes. Votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Fermer"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Réessayez. Tentative <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> sur <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vos données seront supprimées"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si vous entrez un schéma incorrect à la prochaine tentative, les données de cet appareil seront supprimées"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si vous entrez un NIP incorrect à la prochaine tentative, les données de cet appareil seront supprimées"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si vous entrez un mot de passe incorrect à la prochaine tentative, les données de cet appareil seront supprimées"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si vous entrez un schéma incorrect à la prochaine tentative, cet utilisateur sera supprimé"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si vous entrez un NIP incorrect à la prochaine tentative, cet utilisateur sera supprimé"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si vous entrez un mot de passe incorrect à la prochaine tentative, cet utilisateur sera supprimé"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si vous entrez un schéma incorrect à la prochaine tentative suivante, votre profil professionnel et ses données seront supprimés"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si vous entrez un NIP incorrect à la prochaine tentative suivante, votre profil professionnel et ses données seront supprimés"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si vous entrez un mot de passe incorrect à la prochaine tentative suivante, votre profil professionnel et ses données seront supprimés"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Trop de tentatives incorrectes. Les données de cet appareil seront supprimées."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Trop de tentatives incorrectes. Cet utilisateur sera supprimé."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Trop de tentatives incorrectes. Ce profil professionnel et ses données seront supprimés."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorer"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Doit comprendre au moins <xliff:g id="COUNT">%d</xliff:g> caractères"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Le NIP doit comprendre au moins <xliff:g id="COUNT">%d</xliff:g> chiffres"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -657,7 +721,7 @@
     <string name="wifi_display_options_title" msgid="5740656401635054838">"Options d\'affichage sans fil"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"Supprimer"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"Terminé"</string>
-    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"nom"</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 Mb/s"</string>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuration de sécurité du routeur sans fil (TKIP) n\'est pas compatible."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Échec de l\'authentification. Veuillez réessayer."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Une autre session WPS a été détectée. Veuillez réessayer dans quelques minutes."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi-Fi déconnecté. La configuration du WPS a été annulée."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nom du réseau"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Saisissez le SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sécurité"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,36 +1062,46 @@
     <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>
+    <!-- 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">"Heure de début"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Heure de fin"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Activé : <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">"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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Par défaut"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Personnalisé"</string>
-    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Changer le fond d\'écran"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Change le fond d\'écran"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personnalisez votre écran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionner un fond d\'écran dans"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Écran de veille"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Pendant la charge ou sur une station d\'accueil"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Les deux"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pendant la charge"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"En charge"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Sur la station d\'accueil"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Jamais"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Désactivé"</string>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"Activer l\'écran lorsque vous recevez des notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Toujours activé"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Afficher l\'heure, les icônes de notifications et d\'autres renseignements"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de police"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Agrandissez ou réduisez le texte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage SIM"</string>
@@ -1238,7 +1341,7 @@
     <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>
-    <string name="apn_name" msgid="4115580098369824123">"Nom"</string>
+    <string name="apn_name" msgid="4115580098369824123">"nom"</string>
     <string name="apn_apn" msgid="2479425126733513353">"Nom du point d\'accès"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"Serveur mandataire"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"Port"</string>
@@ -1273,12 +1376,13 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Réinitialiser"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Réinitialisation paramètres réseau"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Cette opération entraîne la réinitialisation de tous les paramètres réseau, y compris :\n\n"<li>"Le Wi‑Fi"</li>\n<li>"Les données cellulaires"</li>\n<li>"Le Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Cette opération entraîne la réinitialisation de tous les paramètres réseau, y compris :\n\n"<li>"le Wi‑Fi"</li>\n<li>"les données cellulaires"</li>\n<li>"le Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Réinitialiser les paramètres"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Réinitialiser tous les paramètres réseau? Cette action est irréversible."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Réinitialiser les paramètres"</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Effacer la carte SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Effacer toutes les données de la mémoire de stockage USB interne, telles que la musique ou les photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Effacer les cartes eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Effacer toutes les cartes eSIM sur le téléphone. Cela n\'annulera pas votre forfait de services cellulaires."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Effacer toutes les cartes eSIM sur la tablette. Cela n\'annulera pas votre forfait de services cellulaires."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Réinitialiser la tablette"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Effacer toutes vos données personnelles et les applications téléchargées? Cette action est irréversible."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1425,7 +1526,7 @@
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Choisir votre 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_your_pin_header" msgid="49038294648213197">"Confirmez 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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1500,7 +1607,7 @@
     <string name="auto_launch_label" msgid="2669236885531442195">"Ouvert par défaut"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Valeurs par défaut"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilité de l\'écran"</string>
-    <string name="permissions_label" msgid="2605296874922726203">"Autorisations"</string>
+    <string name="permissions_label" msgid="2605296874922726203">"Permissions"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Vider le cache"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
@@ -1537,9 +1644,9 @@
     <string name="show_running_services" msgid="5736278767975544570">"Afficher les services en cours"</string>
     <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" msgid="1321050641018356925">"Réinitialiser préf. applis"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences?"</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_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>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Diffusion en cours"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Mémoire de stockage USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Désactivés"</string>
     <string name="not_installed" msgid="2797554494953450291">"Pas installée pour cet utilisateur"</string>
     <string name="installed" msgid="3070865169422600098">"Installée"</string>
     <string name="no_applications" msgid="7336588977497084921">"Aucune application"</string>
@@ -1596,7 +1704,7 @@
     <string name="system_package" msgid="1352722848400644991">"Les mises à jour du système ne peuvent pas être installées sur des supports externes."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Les applications d\'administration d\'appareils ne peuvent pas être installées sur un support externe"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Forcer l\'arrêt?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Si vous forcez l\'arrêt d\'une application, son fonctionnement peut en être affecté."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Si vous forcez l\'arrêt d\'une application, cela peut provoquer son dysfonctionnement."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Impossible de déplacer l\'application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Emplacement d\'installation souhaité"</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1755,7 +1868,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilité"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Paramètres d\'accessibilité"</string>
     <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_title" msgid="4204111425716868288">"Paramètres visuels"</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="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>
@@ -1873,6 +1986,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>
@@ -1899,7 +2016,7 @@
     <string name="printer_info_desc" msgid="5824995108703060003">"Plus d\'information sur cette imprimante"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pile"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition·de·l\'utilisation·de·la·batterie"</string>
-    <string name="power_usage_not_available" msgid="3109326074656512387">"Info d\'utilisation pile non dispo"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Info d\'utilisation batterie indispo"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"Temps restant : <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> avant le chargement complet"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Écran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampe de poche"</string>
     <string name="power_camera" msgid="4976286950934622605">"Appareil photo"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2365,7 +2525,7 @@
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Le suivi de consommation du fournisseur de service peut différer de celui de l\'appareil."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Appel d\'urgence"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retour à l\'appel"</string>
-    <string name="vpn_name" msgid="4689699885361002297">"Nom"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"nom"</string>
     <string name="vpn_type" msgid="5435733139514388070">"Type"</string>
     <string name="vpn_server" msgid="2123096727287421913">"Adresse du serveur"</string>
     <string name="vpn_mppe" msgid="6639001940500288972">"Chiffrement PPP (MPPE)"</string>
@@ -2654,16 +2814,19 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Applications par défaut"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Langues, sauvegardes, mises à jour"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Rechercher dans les paramètres"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Paramètres de recherche"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Paramètres de recherche"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, connexion réseau"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"message texte, envoyer des messages, messages, messagerie"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"geste"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"payer, toucher, paiements"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sauvegarde, sauvegarder"</string>
+    <!-- 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">"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>
@@ -2731,7 +2900,7 @@
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Son fourni par l\'application"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"Son de notification par défaut"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Son par défaut pour l\'alarme"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreur pour les appels"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreur aussi pour les appels"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonalités du clavier"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons du verrouillage d\'écran"</string>
@@ -2752,12 +2921,12 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> règles automatiques activées</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Préférences Ne pas déranger"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritaires seulement"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Priorités seulement"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Règles automatiques"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Créer règles Ne pas déranger"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limiter sons et vibrations à certains moments"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Prioritaires seulement"</string>
-    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes seulement"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Priorités seulement"</string>
+    <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Aucune interruption"</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">"Bloquer dérangements visuels"</string>
@@ -2833,8 +3002,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>
@@ -2859,10 +3026,10 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ne jamais afficher ces notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Afficher les notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ne jamais afficher les notifications dans l\'ombre ou sur des appareils périphériques"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"Autoriser la pastille de notification"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"Autoriser le point de notification"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Afficher le point de notification"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer le mode Ne pas déranger"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Activer les notifications de cette application même lorsque l\'option Ne pas déranger est définie sur Prioritaires uniquement"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer le mode « Ne pas déranger »"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Activer les notifications de cette application même lorsque l\'option « Ne pas déranger » est définie sur « Prioritaires uniquement »"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"À l\'écran de verrouillage"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqué"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorité"</string>
@@ -2892,9 +3059,9 @@
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Pendant les événements suivants :"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Pendant les événements de l\'agenda <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"tout agenda"</string>
-    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Si la réponse est : <xliff:g id="REPLY">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Où se trouve la réponse : <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Tout agenda"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Si la réponse est"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Où se trouve la réponse"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"Oui, Peut-être ou Sans réponse"</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"Oui ou Peut-être"</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"Oui"</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -3000,7 +3162,7 @@
     <string name="storage_type_internal" msgid="6042049833565674948">"Mémoire stockage interne"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Stockage externe"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Utilisation données application"</string>
-    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> utilisés depuis <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> utilisé depuis <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"Espace de stockage utilisé"</string>
     <string name="change" msgid="6657848623929839991">"Modifier"</string>
     <string name="change_storage" msgid="600475265207060436">"Modifier type de stockage"</string>
@@ -3035,7 +3197,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personnel"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Travail"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"Applications : toutes"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Applis : notifications bloquées"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Applications : notif. bloquées"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Catégories : importance urgente"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Catégories : importance faible"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Catégories : notif. bloquées"</string>
@@ -3095,6 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Installer applis inconnues"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Autorisation de modifier les paramètres système"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Autoriser la modif. des paramètres du système"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres du système."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Autoriser de cette source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Pivot. poignet deux fois pour app. photo"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Ouvrez l\'application de l\'appareil photo en pivotant votre poignet deux fois"</string>
@@ -3233,7 +3400,7 @@
     <string name="notification_summary_none" msgid="4586376436702610">"Activées pour toutes les applications"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> applications installées"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 applications installées"</string>
-    <string name="storage_summary" msgid="3801281635351732202">"Utilisé : <xliff:g id="PERCENTAGE">%1$s</xliff:g>. Libre : <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
+    <string name="storage_summary" msgid="3801281635351732202">"Utilisé : <xliff:g id="PERCENTAGE">%1$s</xliff:g>. Libre : <xliff:g id="FREE_SPACE">%2$s</xliff:g>."</string>
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Stockage interne : <xliff:g id="PERCENTAGE">%1$s</xliff:g> utilisé - <xliff:g id="FREE_SPACE">%2$s</xliff:g> disponible"</string>
     <string name="display_summary" msgid="6737806235882127328">"Passer en veille après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"Fond d\'écran, mode sommeil, taille de la police"</string>
@@ -3275,7 +3442,7 @@
     <string name="condition_work_title" msgid="7293722361184366648">"Profil professionnel désactivé"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Les applications, la synchronisation en arrière-plan et d\'autres fonctionnalités liées à votre profil professionnel sont désactivées."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Éclairage nocturne activé"</string>
-    <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran a une teinte ambre qui peut vous aider à vous endormir."</string>
+    <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran a une teinte ambre. Cela peut vous aider à vous endormir."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Supprimer"</string>
@@ -3296,8 +3463,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Seuil à partir duquel un avertissement relatif à la consommation des données est envoyé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Seuil à partir duquel un avertissement relatif à la consommation des données est envoyé : <xliff:g id="ID_1">%1$s</xliff:g> / Limite de consommation des données : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Cycle de facturation"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Le cycle mensuel débute le <xliff:g id="ID_1">%1$s</xliff:g> de chaque mois"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Tous les mois à partir du <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Mensuel (<xliff:g id="ID_1">%1$s</xliff:g> jour du mois)"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Restrictions réseau"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restriction</item>
@@ -3317,7 +3483,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications sont autorisées à ignorer les restrictions lorsque la fonction Économiseur de données est activée</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Économiseur de données"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Accès non restreint données"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Données sans restrictions"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Les données en arrière-plan sont désactivées"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activée"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Désactivée"</string>
@@ -3372,7 +3538,7 @@
     <string name="special_access" msgid="3458780842491881155">"Accès spéciaux aux applis"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restriction</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent utiliser les données sans restriction</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> application peuvent utiliser les données sans restriction</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Voulez-vous vraiment effacer les données des utilisateurs et chiffrer les fichiers?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Effacer et convertir"</string>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3404,7 +3569,7 @@
     <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">"Vous voyagez à l\'étranger?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Des frais d\'interurbain peuvent s\'appliquer"</string>
+    <string name="support_international_phone_summary" msgid="208231793637026927">"Des frais d\'interurbains peuvent s\'appliquer"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Téléphone"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Clavardage"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Découvrir des conseils et des astuces"</string>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatique"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libérer de l\'espace maintenant"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestes"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Raccourcis des gestes"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestes rapides pour contrôler votre téléphone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestes rapides pour contrôler votre tablette"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestes rapides pour contrôler votre appareil"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accès rapide à l\'appareil photo"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Passer à l\'appareil photo"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pour ouvrir rapidement l\'appareil photo, il vous suffit d\'appuyer deux fois sur l\'interrupteur. Cela fonctionne à partir de n\'importe quel écran."</string>
+    <!-- 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">"Changer d\'appareil photo"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Toucher deux fois le téléphone pour le consulter"</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">"Touchez deux fois pour le consulter"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Touchez l\'écran deux fois pour consulter votre tablette"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Touchez l\'écran deux fois pour consulter votre appareil"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Pour consulter rapidement vos notifications, touchez l\'écran deux fois."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisir pour consulter le téléphone"</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">"Saisir le téléphone pour le consulter"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Saisissez la tablette pour consulter les notifications"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Saisissez l\'appareil pour consulter les notifications"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Pour consulter rapidement vos notifications, 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>
+    <!-- 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">"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>
+    <!-- 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">"Soulever le téléphone pour ouvrir l\'appareil photo"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Pour ouvrir automatiquement l\'appareil photo, soulevez votre téléphone dans une position de prise de photo (portrait ou paysage). Cela fonctionne lorsque votre téléphone est en veille ou verrouillé."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Prenez des photos quand le téléphone est en veille ou verrouillé"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Geste d\'assistance"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilité"</string>
@@ -3487,7 +3679,7 @@
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Votre espace de stockage est maintenant géré par le gestionnaire de stockage"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Comptes pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"Configurer"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"Synchroniser auto. données"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"Synchroniser automatiquement les données"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Synchroniser automatiquement les données personnelles"</string>
     <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>
@@ -3572,6 +3764,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Voulez-vous supprimer cette application instantanée?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jeux"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Fichiers audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espace utilisé"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(désinst. pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Service de remplissage automatique"</string>
@@ -3585,5 +3778,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Application instantanée"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Désactiver le gestionnaire de stockage?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Applications de films et d\'émissions de télévision"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espace utilisé"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Données d\'approvisionnement du fournisseur de services"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher l\'approvisionnement du fournisseur de services"</string>
+    <!-- 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-fr/arrays.xml b/res/values-fr/arrays.xml
index de93bac..e8d1cb4 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bonne"</item>
     <item msgid="8986346415847956850">"Excellente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Toujours"</item>
-    <item msgid="844721238536786870">"Uniquement si l\'appareil est branché"</item>
-    <item msgid="1986753720941888596">"Jamais"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Toujours"</item>
-    <item msgid="7433294150916905997">"Uniquement si appareil branché"</item>
-    <item msgid="1390404486722375028">"Jamais"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 derniers jours"</item>
     <item msgid="6600989128423965319">"Définir cycle conso..."</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b8f49bf..5caf2d3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Refuser"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fermer"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Changer"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir développeur</item>
       <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir développeur</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localisation"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sécurité et localisation"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sécurité et localisation"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Chiffrement et identifiants"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Téléphone chiffré"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Appareil chiffré"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'enregistrement n\'est pas terminé."</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Délai d\'enregistrement de l\'empreinte digitale expiré. Veuillez réessayer."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement de l\'empreinte digitale n\'a pas fonctionné. Veuillez réessayer ou utiliser un autre doigt."</string>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Modifier le schéma de déverrouillage"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le code PIN de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Réessayez. Tentative <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> sur <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Dernière tentative"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Si vous saisissez un schéma professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Si vous saisissez un code professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Si vous saisissez un mot de passe professionnel incorrect lors de cette tentative, votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Trop de tentatives incorrectes. Votre profil professionnel et les données associées seront supprimés sur cet appareil."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignorer"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Réessayez. Tentative <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> sur <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vos données seront supprimées"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Si vous dessinez un schéma incorrect lors de la prochaine tentative, les données de l\'appareil seront supprimées"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Si vous saisissez un code incorrect lors de la prochaine tentative, les données de l\'appareil seront supprimées"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Si vous saisissez un mot de passe incorrect lors de la prochaine tentative, les données de l\'appareil seront supprimées"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Si vous dessinez un schéma incorrect lors de la prochaine tentative, ce compte utilisateur sera supprimé"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Si vous saisissez un code incorrect lors de la prochaine tentative, ce compte utilisateur sera supprimé"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Si vous saisissez un mot de passe incorrect lors de la prochaine tentative, ce compte utilisateur sera supprimé"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Si vous dessinez un schéma incorrect lors de la prochaine tentative, votre profil professionnel et les données associées seront supprimés"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Si vous saisissez un code incorrect lors de la prochaine tentative, votre profil professionnel et les données associées seront supprimés"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Si vous saisissez un mot de passe incorrect lors de la prochaine tentative, votre profil professionnel et les données associées seront supprimés"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Trop de tentatives incorrectes. Les données de cet appareil vont être supprimées."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Trop de tentatives incorrectes. Ce compte utilisateur va être supprimé."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Trop de tentatives incorrectes. Ce profil professionnel et les données associées vont être supprimés."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorer"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> caractères"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Le code doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> chiffres"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
@@ -568,7 +616,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Annuler"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Suivant"</string>
     <string name="lock_setup" msgid="3355847066343753943">"La configuration est terminée."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Applis d\'administration des appareils"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Applications d\'administration d\'appareils"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Aucune application active"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application active</item>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuration de sécurité du routeur sans fil (TKIP) n\'est pas compatible."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Échec de l\'authentification. Veuillez réessayer."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Une autre session WPS a été détectée. Veuillez réessayer dans quelques minutes."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi-Fi déconnecté. La configuration WPS a été annulée."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nom du réseau"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Saisissez le SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sécurité"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Heure de début"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Heure de fin"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Activé - <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Activer l\'écran lors de la réception de notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Toujours activé"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Afficher l\'heure, les icônes de notification et d\'autres informations"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Agrandir ou réduire le texte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres verrouillage SIM"</string>
@@ -1066,7 +1169,7 @@
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Mises à jour du système"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Version d\'Android"</string>
-    <string name="security_patch" msgid="8438384045870296634">"Mise à jour du correctif de sécurité Android"</string>
+    <string name="security_patch" msgid="8438384045870296634">"Niveau du correctif de sécurité Android"</string>
     <string name="model_info" msgid="1952009518045740889">"Modèle"</string>
     <string name="hardware_info" msgid="2605080746512527805">"Modèle et matériel"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"Version du matériel"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Formater la carte SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Effacer toutes les données de la mémoire de stockage USB interne, telles que la musique ou les photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Effacer les cartes eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Supprimer toutes les cartes eSIM du téléphone. Cette opération n\'annulera pas votre forfait mobile."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Supprimer toutes les cartes eSIM de la tablette. Cette opération n\'annulera pas votre forfait mobile."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Réinitialiser la tablette"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Réinitialiser le téléphone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Effacer toutes vos informations personnelles et les applications téléchargées ? Cette action est irréversible."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"En cours"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stockage USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Désactivée"</string>
     <string name="not_installed" msgid="2797554494953450291">"Non installé pour cet utilisateur"</string>
     <string name="installed" msgid="3070865169422600098">"Installée"</string>
     <string name="no_applications" msgid="7336588977497084921">"Aucune application"</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Écran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampe de poche"</string>
     <string name="power_camera" msgid="4976286950934622605">"Caméra"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2567,10 +2727,10 @@
     <string name="support_summary" msgid="8276116616493882830">"Articles d\'aide, service d\'assistance par téléphone et par chat"</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>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"Recevoir alertes menaces extrêmes biens et personnes"</string>
-    <string name="severe_threats_title" msgid="8362676353803170963">"Menaces graves"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Recevoir alertes pour menaces graves biens et personnes"</string>
+    <string name="extreme_threats_title" msgid="6549541803542968699">"Menaces graves"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"Recevoir alertes menaces graces pours les biens et personnes"</string>
+    <string name="severe_threats_title" msgid="8362676353803170963">"Menaces sévères"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Recevoir alertes pour menaces sévères aux biens et personnes"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"Alertes Enlèvement"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Recevoir les bulletins relatifs aux enlèvements d\'enfants"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Répéter"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Applications par défaut"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Langues, date et heure, sauvegarde, mises à jour"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Rechercher dans les paramètres"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Rechercher dans les paramètres"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Paramètres de recherche"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Paramètres de recherche"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, connexion réseau"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, SMS/MMS, messages, message"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellulaire, mobile, opérateur mobile, sans fil, données, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"geste"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"payer, appuyer, paiements"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sauvegarde, sauvegarder"</string>
+    <!-- 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">"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>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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>
@@ -2996,7 +3158,7 @@
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Ouvrir sans demander l\'autorisation"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Liens compatibles"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Autres valeurs par défaut"</string>
-    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> utilisés dans <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"Utilisation de la <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">"Stockage interne"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Stockage externe"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Consommation données applis"</string>
@@ -3069,9 +3231,9 @@
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Accepter"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Refuser"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Sélectionner la saisie vocale"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"Navigateur"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Application de navigateur"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Aucun navigateur par défaut"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Application de téléphone"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Application  de téléphone"</string>
     <string name="default_app" msgid="6864503001385843060">"(Par défaut)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Système)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Paramètres par défaut)"</string>
@@ -3095,6 +3257,12 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Afficher l\'utilisation de l\'appareil chargé"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Afficher utilisation appli"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Utilisation intensive"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> application présente un comportement anormal</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications présentent un comportement anormal</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Installation d\'applications inconnues"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Autorisation modifier paramètres système par applis"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Autoriser modification des paramètres système"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres système."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Autoriser cette source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Double rotation pour l\'appareil photo"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Ouvrez l\'application Appareil photo en faisant pivoter votre poignet deux fois."</string>
@@ -3275,7 +3442,7 @@
     <string name="condition_work_title" msgid="7293722361184366648">"Profil professionnel désactivé"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Les applications, la synchronisation en arrière-plan et d\'autres fonctionnalités liées à votre profil professionnel sont désactivées."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Éclairage nocturne activé"</string>
-    <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran prend une teinte rouge ambré qui peut vous aider à vous endormir."</string>
+    <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran est teinté en rouge ambré. Ceci peut vous aider à vous endormir."</string>
     <string name="suggestions_title" msgid="7280792342273268377">"Suggestions"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"Supprimer"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatique"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuels"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libérer de l\'espace maintenant"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestes"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Raccourcis des gestes"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestes rapides pour contrôler votre téléphone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestes rapides pour contrôler votre tablette"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestes rapides pour contrôler votre appareil"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accès rapide à l\'appareil photo"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pour accéder rapidement à l\'appareil photo, appuyez deux fois sur le bouton Marche/Arrêt. Fonctionne à partir de n\'importe quel écran."</string>
+    <!-- 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">"Activation du mode selfie"</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">"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>
+    <!-- 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">"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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Utiliser le lecteur d\'empreinte pour afficher les notifications"</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">"Utilisation du lecteur d\'empreinte pour voir les notifications"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière du téléphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière de la tablette."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière de l\'appareil."</string>
+    <!-- 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">"Lever le téléphone pour ouvrir l\'appareil photo"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Pour ouvrir l\'appareil photo automatiquement, prenez votre téléphone et faites comme si vous alliez prendre une photo (en mode Portrait ou Paysage). Fonctionne même lorsque le téléphone est en veille ou verrouillé."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Prendre photos quand téléphone est en veille ou verrouillé"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Geste d\'assistance"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilité"</string>
@@ -3487,7 +3679,7 @@
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Votre espace de stockage est désormais géré par le gestionnaire d\'espace de stockage."</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Comptes pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"Configurer"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"Synchronisation auto. données"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"Synchronisation automatique des données"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Synchronisation automatique des données personnelles"</string>
     <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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-gl/arrays.xml b/res/values-gl/arrays.xml
index 9cd177a..99d2d5a 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Boa"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Só cando está conectada"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Só cando está conectada"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 días"</item>
     <item msgid="6600989128423965319">"Definir ciclo de uso..."</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 018a900..6bc68f2 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Rexeitar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Pechar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Cambiar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Descoñecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Agora estás a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser programador.</item>
       <item quantity="one">Agora estás a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> paso de ser programador.</item>
     </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 +41,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Fornecemento VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Videochamadas activadas"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas por wifi activadas"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/presenza fornecidos"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Alimentación da radio móbil"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver axenda de enderezos da SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ver números de marcación fixa"</string>
@@ -106,10 +107,26 @@
     <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>
+    <!-- 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">"Non tes permiso para cambiar a configuración de Bluetooth."</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> será visible para dispositivos próximos coa configuración de Bluetooth activada."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os teus dispositivos"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Seleccionar zona horaria"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localización"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Seguranza e localización"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Teléfono encriptado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"O dispositivo está encriptado"</string>
@@ -339,13 +363,13 @@
     <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_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_dashboard_summary" msgid="6757421634477554939">"Bloqueo da pantalla, impresión dixital"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo da pantalla"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impresión dixital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Xest. identificación"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar identificac. para"</string>
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Engadir impresión dixital"</string>
-    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueo de pantalla"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueo da pantalla"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
       <item quantity="other">Configuráronse <xliff:g id="COUNT_1">%1$d</xliff:g> impresións dixitais</item>
       <item quantity="one">Configurouse <xliff:g id="COUNT_0">%1$d</xliff:g> impresión dixital</item>
@@ -354,40 +378,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Non se completou a inscrición"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Esgotouse o tempo de espera da inscrición de impresión dixital. Téntao de novo."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"A inscrición de impresión dixital non funcionou. Téntao de novo ou utiliza outro dedo."</string>
@@ -449,7 +488,9 @@
     <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="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcións de bloqueo da pantalla"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcións de bloqueo da pantalla"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo da pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / inmediatamente despois de entrar en suspensión"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> despois de entrar en suspensión"</string>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Bloqueo perf. traballo"</string>
@@ -459,13 +500,13 @@
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ningún"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Pasar o dedo"</string>
-    <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sen seguranza"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sen seguridade"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Padrón"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Seguranza media"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Seguridade media"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguranza de media a alta"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Seguridade de media a alta"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasinal"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta seguranza"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Alta seguridade"</string>
     <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Agora non"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"Bloqueo de pantalla actual"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Impresión dixital + padrón"</string>
@@ -519,13 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrón desbloq."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN desbloq."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar contrasinal desbloq."</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Téntao de novo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Último intento"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se introduces un padrón de traballo incorrecto neste intento, o teu perfil de traballo e os datos asociados eliminaranse deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se introduces un PIN de traballo incorrecto neste intento, o teu perfil de traballo e os datos asociados eliminaranse deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se introduces un contrasinal de traballo incorrecto neste intento, o teu perfil de traballo e os datos asociados eliminaranse deste dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Realizaches demasiados intentos incorrectos. O teu perfil de traballo e os datos asociados eliminaranse deste dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignorar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Téntao de novo. Intento <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Eliminaranse os teus datos"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se introduces un padrón incorrecto no seguinte intento, eliminaranse os datos deste dispositivo"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se introduces un PIN incorrecto no seguinte intento, eliminaranse os datos deste dispositivo"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se introduces un contrasinal incorrecto no seguinte intento, eliminaranse os datos deste dispositivo"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se introduces un padrón incorrecto no seguinte intento, eliminarase este usuario"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se introduces un PIN incorrecto no seguinte intento, eliminarase este usuario"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se introduces un contrasinal incorrecto no seguinte intento, eliminarase este usuario"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se introduces un padrón incorrecto no seguinte intento, eliminaranse o teu perfil de traballo e os datos asociados"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se introduces un PIN incorrecto no seguinte intento, eliminaranse o teu perfil de traballo e os datos asociados"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se introduces un contrasinal incorrecto no seguinte intento, eliminaranse o teu perfil de traballo e os datos asociados"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Realizaches demasiados intentos incorrectos. Eliminaranse os datos deste dispositivo."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Realizaches demasiados intentos incorrectos. Eliminarase este usuario."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Realizaches demasiados intentos incorrectos. Eliminaranse este perfil de traballo e os datos asociados."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Debe ter polo menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"O PIN debe ter polo menos <xliff:g id="COUNT">%d</xliff:g> díxitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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">"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>
@@ -743,11 +808,10 @@
     <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectado coa rede wifi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS xa está en curso e pode tardar ata dos minutos en completarse"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Fallo de WPS. Téntao de novo nuns minutos."</string>
-    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Non se admite a configuración de seguranza do router sen fíos (WEP)"</string>
-    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Non se admite a configuración de seguranza do router sen fíos (TKIP)"</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Non se admite a configuración de seguridade do router sen fíos (WEP)"</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Non se admite a configuración de seguridade do router sen fíos (TKIP)"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Fallo de autenticación. Téntao de novo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Detectouse outra sesión WPS. Téntao de novo nuns minutos."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"A wifi destá esconectada. Cancelouse a configuración de WPS."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nome da rede"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Introduce o SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguranza"</string>
@@ -810,7 +874,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 +910,28 @@
     <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>
+    <!-- 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_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">"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,13 +978,14 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Cando están activadas as chamadas wifi, o teu teléfono pode enviar as túas chamadas a través de redes wifi ou da rede do teu operador, dependendo das túas preferencias e de cal teña o sinal máis forte. Antes de activar esta función, consulta co teu operador as tarifas e outra información."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Actualizar enderezo de emerxencia"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Enderezo que utilizan os servizos de emerxencia como a túa localización se chamas ao 911 a través da wifi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos musicais"</string>
-    <string name="ring_volume_title" msgid="5592466070832128777">"Volume do ton"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"Volume do timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar cando está en silencio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Son de notificación predeterminado"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ton de chamada"</string>
@@ -980,23 +1063,33 @@
     <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>
+    <!-- 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">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Activado/<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">"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 +1113,19 @@
     <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>
+    <!-- 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">"Activa a pantalla cando recibes notificacións"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre activado"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostra a hora, as iconas de notificación e outra información"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Reduce ou amplía o texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo da SIM"</string>
@@ -1122,7 +1226,7 @@
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenamento"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarxeta SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desactivar almac. USB interno"</string>
-    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desactiva a tarxeta SD para poder extraela con seguranza"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desactiva a tarxeta SD para poder extraela con seguridade"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inserir almacenamento USB"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Inserir unha tarxeta SD"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Inserir almacenamento USB"</string>
@@ -1179,8 +1283,8 @@
     <string name="storage_volume_used_total" msgid="6113121714019000244">"Total usado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"Inseriuse <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"Non se puido inserir <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="storage_unmount_success" msgid="5737203344673441677">"Expulsouse <xliff:g id="NAME">%1$s</xliff:g> con seguranza"</string>
-    <string name="storage_unmount_failure" msgid="5758387106579519489">"Non se puido expulsar <xliff:g id="NAME">%1$s</xliff:g> con seguranza"</string>
+    <string name="storage_unmount_success" msgid="5737203344673441677">"Expulsouse <xliff:g id="NAME">%1$s</xliff:g> con seguridade"</string>
+    <string name="storage_unmount_failure" msgid="5758387106579519489">"Non se puido expulsar <xliff:g id="NAME">%1$s</xliff:g> con seguridade"</string>
     <string name="storage_format_success" msgid="3023144070597190555">"Formatouse <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"Non se puido formatar <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"Cambiar o nome do almacenamento"</string>
@@ -1273,6 +1377,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>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Borrar tarxeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos os datos do almacenamento USB interno, como a música ou as fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos os datos da tarxeta SD, como a música ou as fotos"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Borrar as eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Borra todas as eSIM do teléfono. Esta acción non cancelará o teu plan de servizo móbil."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Borra todas as eSIM da tableta. Esta acción non cancelará o teu plan de servizo móbil."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer teléfono"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Queres borrar toda a túa información persoal e as aplicacións descargadas? Non podes desfacer esta acción."</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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,7 +1478,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localización"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utiliza o GPS, a wifi, o Bluetooth ou as redes de telefonía móbil para determinar a localización"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utiliza a wifi, o Bluetooth ou as redes de telefonía móbil para determinar a localización"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usa o GPS para determinar a localización"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Usa o GPS e os sensores do dispositivo para determinar a localización"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Busca de conexións"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Busca de redes wifi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Mellora a localización permitindo que as aplicacións do sistema e os servizos detecten redes wifi en calquera momento."</string>
@@ -1416,8 +1518,8 @@
     <string name="settings_license_activity_title" msgid="8525014571806471216">"Licenzas de terceiros"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Hai un problema para cargar as licenzas."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando..."</string>
-    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Información de seguranza"</string>
-    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguranza"</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Información de seguridade"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridade"</string>
     <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>
@@ -1475,7 +1577,7 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Realizáronse demasiados intentos incorrectos. Téntao de novo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"A aplicación non está instalada no teléfono."</string>
     <string name="lock_settings_profile_title" msgid="2121876391814535295">"Seguranza do perfil de traballolevel"</string>
-    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Bloqueo de pantalla do perfil de traballo"</string>
+    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Bloqueo da pantalla do perfil de traballo"</string>
     <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Utilizar un bloqueo"</string>
     <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Utilizar un bloqueo para o perfil de traballo e a pantalla do dispositivo"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Queres utilizar un bloqueo?"</string>
@@ -1491,6 +1593,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1658,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"En execución"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na tarxeta SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Desactivada"</string>
     <string name="not_installed" msgid="2797554494953450291">"Sen instalar para este usuario"</string>
     <string name="installed" msgid="3070865169422600098">"Aplicación instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ningunha aplicación"</string>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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">"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>
@@ -1838,7 +1952,7 @@
     <string name="captioning_typeface" msgid="1826169240566563259">"Familia do tipo de letra"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"Os subtítulos terán un aspecto similar ao seguinte"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
-    <string name="locale_default" msgid="2593883646136326969">"Predeterminado"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Predeterminada"</string>
     <string name="color_title" msgid="4258931051732243983">"Cor"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Predeterminado"</string>
     <string name="color_none" msgid="3475640044925814795">"Ningún"</string>
@@ -1873,6 +1987,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>
@@ -1899,7 +2017,7 @@
     <string name="printer_info_desc" msgid="5824995108703060003">"Máis información sobre esta impresora"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo de batería"</string>
-    <string name="power_usage_not_available" msgid="3109326074656512387">"Datos de uso non dispoñibles"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Datos batería non dispoñibles"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> restante(s)"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> para completar a carga"</string>
@@ -1939,12 +2057,52 @@
     <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>
+    <!-- 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">"Pantalla"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Cámara"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wifi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="3392999761958982492">"Rede de telefonía móbil en modo de espera"</string>
+    <string name="power_cell" msgid="3392999761958982492">"A rede de telefonía móbil está en modo de espera"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tableta inactiva"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
@@ -1953,7 +2111,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2815,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicacións predeterminadas"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, hora, copia de seguranza, actualizacións"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Buscar na configuración"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Buscar na configuración"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Configuración de busca"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Configuración de busca"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, rede, conexión"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensaxe de texto, mensaxes de texto, mensaxes, mensaxaría"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"móbil, operador móbil, sen fíos, datos, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2873,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"xesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"copia de seguranza, facer copia de seguranza"</string>
+    <!-- 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">"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>
@@ -2717,14 +2887,14 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Non se poden escribir datos na etiqueta NFC. Se o problema persiste, proba cunha etiqueta diferente"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Non se pode escribir na etiqueta NFC. Utiliza unha etiqueta diferente."</string>
     <string name="default_sound" msgid="8821684447333687810">"Son predeterminado"</string>
-    <string name="sound_settings_summary" msgid="4100853606668287965">"Volume do ton ao <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="sound_settings_summary" msgid="4100853606668287965">"Volume do timbre ao <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibración, Non molestar"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Timbre en modo vibración"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Timbre en modo silencio"</string>
-    <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume do ton ao 80 %"</string>
+    <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume do timbre ao 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Volume dos ficheiros multimedia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume da alarma"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do ton"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do timbre"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificacións"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de chamada do teléfono"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Son de notificación predeterminado"</string>
@@ -2778,7 +2948,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacións"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Configuración avanzada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacións do traballo"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir puntos de notificación"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir punto de notificación"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na pantalla de bloqueo"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o contido das notificacións"</string>
@@ -2828,13 +2998,11 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reducir desenfoque (recomendado)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reducir escintilación"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Pantalla superposta"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Ningunha das aplicacións instaladas é compatible co modo Pantalla superposta"</string>
-    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"imaxe superposta, imaxe en imaxe"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Ningunha das aplicacións instaladas é compatible coas imaxes superpostas"</string>
+    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"superposta imaxe"</string>
     <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>
@@ -2965,11 +3133,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 +3140,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>
@@ -3000,11 +3163,11 @@
     <string name="storage_type_internal" msgid="6042049833565674948">"Almacenamento interno"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Almacenamento externo"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Uso de datos da aplicación"</string>
-    <string name="data_summary_format" msgid="6213211533341068366">"Uso de <xliff:g id="SIZE">%1$s</xliff:g> desde: <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"Uso de <xliff:g id="SIZE">%1$s</xliff:g> desde <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"Almacenamento utilizado"</string>
     <string name="change" msgid="6657848623929839991">"Cambiar"</string>
     <string name="change_storage" msgid="600475265207060436">"Cambiar almacenamento"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"Notificacións da aplicación"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"Notificacións de aplicacións"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"Activadas"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"Todo desactivado"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> categorías desactivadas"</string>
@@ -3095,6 +3258,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,8 +3356,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalar apps descoñecidas"</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>
@@ -3200,8 +3370,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Permiso para modificar a configuración do sistema"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificar a configuración do sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Con este permiso unha aplicación pode modificar a configuración do sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Si"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Permitir desde esta fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dobre xiro para abrir a cámara"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Xira o pulso dúas veces para abrir a aplicación da cámara"</string>
@@ -3233,7 +3401,7 @@
     <string name="notification_summary_none" msgid="4586376436702610">"Activadas para todas as aplicacións"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplicacións instaladas"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 aplicacións instaladas"</string>
-    <string name="storage_summary" msgid="3801281635351732202">"Utilizado: <xliff:g id="PERCENTAGE">%1$s</xliff:g> - Libre: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
+    <string name="storage_summary" msgid="3801281635351732202">"Almacenamento utilizado: <xliff:g id="PERCENTAGE">%1$s</xliff:g> - Almacenamento libre: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Almacenamento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> utilizado, <xliff:g id="FREE_SPACE">%2$s</xliff:g> libre"</string>
     <string name="display_summary" msgid="6737806235882127328">"Despois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"Fondo de pantalla, suspensión, tamaño do tipo de letra"</string>
@@ -3296,8 +3464,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,13 +3484,13 @@
       <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>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso de datos sen restricións"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Acceso sen restricións co Economizador de datos activado"</string>
-    <string name="home_app" msgid="4066188520886810030">"Aplicación de Inicio"</string>
+    <string name="home_app" msgid="4066188520886810030">"Aplicación de inicio"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Non hai inicio predeterminado"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Inicio seguro"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Solicitar un padrón para iniciar o dispositivo. Mentres está apagado, este dispositivo non pode recibir chamadas, mensaxes nin notificacións. Tampouco soan as alarmas."</string>
@@ -3382,11 +3549,10 @@
     <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="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>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Acceso ás SMS premium"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Acceso ás mensaxes premium"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Non é visible para outros dispositivos"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
@@ -3447,28 +3613,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espazo agora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Xestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Atallos de xestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Xestos rápidos para controlar o teléfono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Xestos rápidos para controlar a tableta"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Xestos rápidos para controlar o dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Acceso rápido á cámara"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir rapidamente a cámara, preme dúas veces o botón de acendido. Isto funciona en calquera pantalla."</string>
+    <!-- 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">"Voltear a cámara"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Levantar o teléfono para abrir a cámara"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir a cámara automaticamente, levanta o teléfono ata a posición de sacar fotos (horizontal ou vertical). Funciona cando o teléfono está en modo de suspensión ou bloqueado."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tira fotos cando o teléfono está en suspensión ou bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Asistencia cos xestos"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidade"</string>
@@ -3572,6 +3765,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Queres eliminar esta aplicación instantánea?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Xogos"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ficheiros de audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Espazo utilizado"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstalado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servizo de autocompletar"</string>
@@ -3585,5 +3779,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Aplicación instantánea"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Queres desactivar o xestor de almacenamento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Aplicacións de películas e televisión"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espazo utilizado"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Información de aprovisionamento do operador"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aprovisionamento do operador do activador"</string>
+    <!-- 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-gu/arrays.xml b/res/values-gu/arrays.xml
index bad1b55..525b5c4 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"સારી"</item>
     <item msgid="8986346415847956850">"ઉત્તમ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"હંમેશા"</item>
-    <item msgid="844721238536786870">"ફક્ત પ્લગ ઇન હોય ત્યારે"</item>
-    <item msgid="1986753720941888596">"ક્યારેય નહીં"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"હંમેશા"</item>
-    <item msgid="7433294150916905997">"ફક્ત પ્લગ ઇન હોય ત્યારે"</item>
-    <item msgid="1390404486722375028">"ક્યારેય નહીં"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"છેલ્લા 30 દિવસ"</item>
     <item msgid="6600989128423965319">"વપરાશ સાયકલ સેટ કરો..."</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index acc4f61..8ab6850 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -23,13 +23,13 @@
     <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="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="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 +41,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>
@@ -72,9 +73,9 @@
     <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>
@@ -88,7 +89,7 @@
     <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_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">"Bluetooth"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"નજીકનાં તમામ Bluetooth ઉપકરણો પર દૃશ્યક્ષમ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
@@ -97,7 +98,7 @@
     <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_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_details" msgid="4594773497930028085">"ઉપકરણ સેટિંગ્સ"</string>
@@ -106,10 +107,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>
@@ -121,7 +138,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">"<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>
@@ -157,6 +175,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) -->
@@ -221,19 +244,19 @@
     <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_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_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="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,7 +282,7 @@
     <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>
@@ -329,13 +352,14 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"એકાઉન્ટ્સ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"સ્થાન"</string>
     <string name="account_settings_title" msgid="626177544686329806">"એકાઉન્ટ્સ"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"સુરક્ષા અને સ્થાન"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"એન્ક્રિપ્શન અને ઓળખપત્રો"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ફોન એન્ક્રિપ્ટ કર્યો"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ઉપકરણ એન્ક્રિપ્ટેડ છે"</string>
     <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">"મારું સ્થાન, સ્ક્રીન અનલૉક, 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="1601828700318996341">"વ્યવસ્થાપકે અક્ષમ કરેલ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"સુરક્ષાની સ્થિતિ"</string>
@@ -353,41 +377,56 @@
     <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નોંધ: તમારી ફિંગરપ્રિન્ટ એક સશક્ત પેટર્ન અથવા 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>
@@ -395,27 +434,27 @@
     <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_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>
     <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_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_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">"તમે તમારા એકાઉન્ટ્સ, સેટિંગ્સ, ડાઉનલોડ કરેલ ઍપ્લિકેશનો અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારું ટેબ્લેટ એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પેટર્ન અથવા સંખ્યાકીય PIN અથવા પાસવર્ડ), તમે તેને ચાલુ કરો ત્યારે દર વખતે ટેબ્લેટને ડિક્રિપ્ટ કરવા માટે સ્ક્રીનને અનલૉક કરવાની જરૂર પડશે. તમારો તમામ ડેટા ભૂંસી નાંખીને ડિક્રિપ્ટ કરવા માટેનો અન્ય બીજો રસ્તો માત્ર ફેક્ટરી ડેટા રીસેટ કરવાનો છે.\n\nએન્ક્રિપ્શનમાં એક કલાક અથવા તેથી વધુ સમય લાગી શકે છે. તમારે સમગ્ર પ્રક્રિયા દરમિયાન બૅટરીને પૂર્ણ ચાર્જ અને તમારા ફોનને પ્લગ ઇન કરીને રાખવો આવશ્યક છે. જો તમે તેમાં ખલેલ પાડશો, તો તમે તમારો કેટલોક અથવા તમામ ડેટા ગુમાવશો"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"તમે તમારા એકાઉન્ટ્સ, સેટિંગ્સ, ડાઉનલોડ કરેલ ઍપ્લિકેશનો અને તેમનો ડેટા, મીડિયા અને અન્ય ફાઇલોને એન્ક્રિપ્ટ કરી શકો છો. તમે તમારો ફોન એન્ક્રિપ્ટ કરી લો તે પછી, તમે એક સ્ક્રીન લૉક સેટ કરી લીધું છે તેમ ધારીને (તે છે કોઈ પેટર્ન અથવા સંખ્યાકીય PIN અથવા પાસવર્ડ), તમે તેને ચાલુ કરો ત્યારે દર વખતે ડિક્રિપ્ટ કરવા માટે સ્ક્રીનને અનલૉક કરવાની જરૂર પડશે. તમારો તમામ ડેટા ભૂંસી નાંખીને ડિક્રિપ્ટ કરવા માટેનો અન્ય બીજો રસ્તો માત્ર ફેક્ટરી ડેટા રીસેટ કરવાનો છે.\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_dialog_need_password_title" msgid="4058971800557767">"કોઇ લૉક સ્ક્રીન પિન અથવા પાસવર્ડ નથી"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"તમે એન્ક્રિપ્શન પ્રારંભ કરી શકો છો તે પહેલાં તમારે લૉક સ્ક્રીન PIN કે પાસવર્ડ સેટ કરવો પડશે."</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>
@@ -449,18 +488,20 @@
     <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_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_change_summary" msgid="2790960639554590668">"પેટર્ન, PIN અથવા પાસવર્ડ સુરક્ષા બદલો અથવા અક્ષમ કરો"</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>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"કોઈ સુરક્ષા નહીં"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"પૅટર્ન"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"પેટર્ન"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"મધ્યમ સુરક્ષા"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"પિન"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"મધ્યમથી ઉચ્ચ સુરક્ષા"</string>
@@ -468,29 +509,29 @@
     <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="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ફિંગરપ્રિન્ટ + પૅટર્ન"</string>
-    <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ફિંગરપ્રિન્ટ + પિન"</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_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>
+    <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_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">
+</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">
 
-</xliff:g>આ ઉપકરણમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ પણ દૂર કરવામાં આવશે અને તમે તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે એપ્લિકેશન્સ પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</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">
 
@@ -499,14 +540,14 @@
     <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>
-    <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_profile" msgid="8682200103576359918">"તમારી પેટર્ન વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</string>
+    <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">"તમારા પિન વગર પ્રોફાઇલ સુરક્ષા સુવિધાઓ કામ કરશે નહીં."</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_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>
+</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">
 
@@ -516,18 +557,26 @@
 
 </xliff:g>આ પ્રોફાઇલમાંથી તમારી સાચવેલ ફિંગરપ્રિન્ટ્સ પણ દૂર કરવામાં આવશે અને તમે તમારી પ્રોફાઇલને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા તેમની સાથે ઍપ્લિકેશનો પર સાઇન ઇન કરવામાં સમર્થ થઇ શકશો નહીં.”"</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_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">"જો તમે આ પ્રયત્ન પર ખોટો કાર્ય પિન દાખલ કરશો, તો આ ઉપકરણ પરથી તમારી કાર્યાલયની પ્રોફાઇલ અને સંકળાયેલો ડેટા દૂર કરવામાં આવશે."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"જો તમે આ પ્રયત્ન પર ખોટો કાર્ય પાસવર્ડ દાખલ કરો છો, તો આ ઉપકરણ પરથી તમારી કાર્યાલયની પ્રોફાઇલ અને સંકળાયેલો ડેટા દૂર કરવામાં આવશે."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ઘણા બધા ખોટા પ્રયત્નો. આ ઉપકરણ પરથી તમારી કાર્યાલયની પ્રોફાઇલ અને સંકળાયેલો ડેટા દૂર કરવામાં આવશે."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"છોડી દો"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ફરી પ્રયાસ કરો. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> માંથી <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> પ્રયત્ન."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"તમારો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"જો તમે આગલા પ્રયત્નમાં ખોટી પેટર્ન દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"જો તમે આગલા પ્રયત્નમાં ખોટો PIN દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"જો તમે આગલા પ્રયત્નમાં ખોટી પેટર્ન દાખલ કરશો, તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"જો તમે આગલા પ્રયત્નમાં ખોટો PIN દાખલ કરશો,તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો આ વપરાશકર્તાને કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"જો તમે આગલા પ્રયત્નમાં ખોટી પેટર્ન દાખલ કરશો, તો તમારી કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"જો તમે આગલા પ્રયત્નમાં ખોટો PIN દાખલ કરશો, તો તમારી કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો તમારી કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ઘણા બધા ખોટા પ્રયત્નો. આ ઉપકરણોનો ડેટા કાઢી નાખવામાં આવશે."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ઘણા બધા ખોટા પ્રયત્નો. આ વપરાશકર્તાને કાઢી નાખવામાં આવશે."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ઘણા બધા ખોટા પ્રયત્નો. આ કાર્ય પ્રોફાઇલ અને તેનો ડેટા કાઢી નાખવામાં આવશે."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"છોડી દો"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ઓછામાં ઓછા <xliff:g id="COUNT">%d</xliff:g> અક્ષર ધરાવતો હોવો જોઈએ"</string>
-    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"પિન ઓછામાં ઓછા <xliff:g id="COUNT">%d</xliff:g> અંક ધરાવતો હોવો જોઈએ"</string>
+    <string name="lockpassword_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="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>
@@ -592,7 +641,7 @@
     <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_pin_other_device" msgid="4637977124526813470">"તમારે આ PIN ને અન્ય ઉપકરણ પર પણ લખવાની જરૂર પડી શકે છે."</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>
@@ -618,17 +667,33 @@
     <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>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"જોડાણ બનાવો અને કનેક્ટ કરો"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"જોડાણ તોડો"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"જોડી કરો અને કનેક્ટ કરો"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"જોડીથી અલગ કરો"</string>
     <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>
+    <!-- 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>
+    <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>
@@ -647,7 +712,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>
@@ -673,7 +738,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 બીમ"</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>
@@ -726,7 +791,7 @@
     <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_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>
@@ -738,7 +803,7 @@
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi સુરક્ષિત સેટઅપ"</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_pin" msgid="223344506445335358">"તમારા વાઇ-ફાઇ રાઉટર પર પિન <xliff:g id="NUMBER">%1$s</xliff:g> દાખલ કરો. સેટઅપને પૂર્ણ થવામાં બે મિનિટનો સમય લાગી શકે છે."</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">"Wi‑Fi નેટવર્ક  <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરેલ"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS પહેલાંથી જ પ્રગતિમાં છે અમે તેમે પૂર્ણ થવામાં બે મિનિટનો સમય લાગી શકે છે"</string>
@@ -747,7 +812,6 @@
     <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_ssid" msgid="5519636102673067319">"નેટવર્કનું નામ"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID દાખલ કરો"</string>
     <string name="wifi_security" msgid="6603611185592956936">"સુરક્ષા"</string>
@@ -810,7 +874,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>
@@ -845,25 +908,44 @@
     <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">"પોર્ટેબલ વાઇ-ફાઇ હૉટસ્પૉટ"</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_tether_starting" msgid="1322237938998639724">"હૉટસ્પૉટ ચાલુ કરી રહ્યું છે…"</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"હૉટસ્પૉટ બંધ કરી રહ્યું છે…"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"પોર્ટેબલ Wi-Fi હોટસ્પોટ"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi હોટસ્પોટ"</string>
+    <!-- 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_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">"હોટસ્પોટ ચાલુ કરી રહ્યું છે…"</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_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_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>
+    <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_settings_title" msgid="4102921303993404577">"Wi-Fi કૉલિંગ"</string>
+    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi કૉલિંગ ચાલુ કરો"</string>
     <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"મોબાઇલ નેટવર્કને બદલે Wi-Fi નો ઉપયોગ કરો"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"કૉલિંગ પસંદગી"</string>
-    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"વાઇ-ફાઇ કૉલિંગ મોડ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi કૉલિંગ મોડ"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"રોમિંગ પસંદગી"</string>
     <!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
     <skip />
@@ -895,7 +977,8 @@
     <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">"જ્યારે 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>
@@ -944,7 +1027,7 @@
     <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>
@@ -952,7 +1035,7 @@
     <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="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 +1063,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,47 +1113,58 @@
     <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>
+    <!-- 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">"સિમ કાર્ડ લૉક સેટિંગ્સ"</string>
-    <string name="sim_lock_settings_category" msgid="6242052161214271091">"સિમ કાર્ડ લૉક"</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">"સિમ કાર્ડ લૉક"</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="default" msgid="2503536505568814324">"ફોનનો ઉપયોગ કરવા માટે પિન જરૂરી છે"</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">"સિમ કાર્ડ લૉક કરો"</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_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>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ફોનનો ઉપયોગ કરવા માટે PIN ની જરૂર છે"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ટેબ્લેટનો ઉપયોગ કરવા માટે PIN જરૂરી છે"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ફોનનો ઉપયોગ કરવા માટે PIN ની જરૂર છે"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"SIM PIN બદલો"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</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">"જૂનો SIM PIN"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"નવો SIM PIN"</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_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_change_pin" msgid="7328607264898359112">"SIM PIN:"</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">"SIM PIN ને સફળતાપૂર્વક બદલ્યો"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"SIM કાર્ડ લૉક સ્થિતિ બદલી શકાતી નથી.\nસંભવિતરૂપે ખોટો PIN છે."</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">"મનપસંદ સિમ કાર્ડ અપડેટ કરીએ?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"મનપસંદ SIM કાર્ડ અપડેટ કરીએ?"</string>
     <string name="sim_preferred_message" msgid="8466930554330635780">"તમારા ઉપકરણમાં એકમાત્ર <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM છે. શું તમે મોબાઇલ ડેટા, કૉલ અને SMS સંદેશા માટે આ SIMનો ઉપયોગ કરવા માગો છો?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ખોટો સિમ પિન કોડ, તમારે હવે તમારું ઉપકરણ અનલૉક કરવા માટે તમારા કૅરીઅરનો સંપર્ક કરવો આવશ્યક છે."</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ખોટો SIM PIN કોડ, તમારે હવે તમારું ઉપકરણ અનલૉક કરવા માટે તમારા કેરીઅરનો સંપર્ક કરવો આવશ્યક છે."</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">Iખોટો SIM PIN કોડ, તમારી પાસે <xliff:g id="NUMBER_1">%d</xliff:g> પ્રયાસ બાકી છે.</item>
+      <item quantity="other">Iખોટો SIM PIN કોડ, તમારી પાસે <xliff:g id="NUMBER_1">%d</xliff:g> પ્રયાસ બાકી છે.</item>
     </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"સિમ પિન ઑપરેશન નિષ્ફળ થયું!"</string>
+    <string name="pin_failed" msgid="1848423634948587645">"SIM PIN ઑપરેશન નિષ્ફળ થયું!"</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>
@@ -1071,8 +1175,8 @@
     <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="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>
@@ -1105,8 +1209,8 @@
     <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>
@@ -1123,20 +1227,20 @@
     <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>
-    <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="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="default" msgid="6998379994779187692">"જો તમે SD કાર્ડને અનમાઉન્ટ કરો છો, તો તમે ઉપયોગમાં લઈ રહ્યાં છો તે કેટલીક ઍપ્લિકેશનો બંધ થઈ જશે અને જ્યાં સુધી તમે SD કાર્ડને ફરીથી માઉન્ટ ન કરી લો ત્યાં સુધી અનુપલબ્ધ હોઈ શકે છે."</string>
@@ -1144,7 +1248,7 @@
     <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="default" msgid="3500976899159848422">"SD કાર્ડને અનમાઉન્ટ કરી શકાયું નહીં. પછી ફરીથી પ્રયાસ કરો."</string>
-    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB સ્ટોરેજ અનમાઉન્ટ કરાશે."</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>
@@ -1206,9 +1310,9 @@
     <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_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>
@@ -1216,7 +1320,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>
@@ -1273,6 +1377,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>
@@ -1298,10 +1403,13 @@
     <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="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">"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>
@@ -1314,36 +1422,30 @@
     <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_wifi" msgid="3277144155960302049">"પોર્ટેબલ હૉટસ્પૉટ"</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_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_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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1353,15 +1455,15 @@
     <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">"Wi‑Fi સહાયક બદલીએ?"</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_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">"કૃપા કરીને SIM કાર્ડ શામેલ કરો અને પુનઃપ્રારંભ કરો"</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>
@@ -1376,7 +1478,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,66 +1523,66 @@
     <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_pattern_header" msgid="6949761069941694050">"તમારી પૅટર્ન પસંદ કરો"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"તમારો પિન પસંદ કરો"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"તમારી પેટર્ન પસંદ કરો"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"તમારો PIN પસંદ કરો"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"તમારા પાસવર્ડની પુષ્ટિ કરો"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"તમારા પેટર્નની પુષ્ટિ કરો"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"તમારા પિનની પુષ્ટિ કરો"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"તમારા PIN ની પુષ્ટિ કરો"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"પાસવર્ડ્સ મેળ ખાતા નથી"</string>
-    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"પિન મેળ ખાતા નથી"</string>
+    <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">"પિન સેટ કરવામાં આવ્યો છે"</string>
-    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"પૅટર્ન સેટ કરવામાં આવી છે"</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">"ચાલુ રાખવા માટે તમારો ઉપકરણ પિન દાખલ કરો"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"ચાલુ રાખવા માટે તમારો ઉપકરણ PIN દાખલ કરો"</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_pin_generic_profile" msgid="3730141667547002246">"ચાલુ રાખવા માટે તમારો કાર્ય PIN દાખલ કરો"</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_pin" msgid="8048122891934295280">"ચાલુ રાખવા માટે તમારો ઉપકરણ PIN દાખલ કરો. ઉપકરણ પુનઃપ્રારંભ થાય તે પછી આવશ્યક છે."</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_pin" msgid="809763184419127790">"ચાલુ રાખવા માટે તમારો કાર્ય PIN દાખલ કરો. ઉપકરણ પુનઃપ્રારંભ થાય તે પછી આવશ્યક છે."</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_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="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">"અનલૉક 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_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_enable_title" msgid="6920616873671115281">"પૅટર્ન આવશ્યક છે"</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_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_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_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_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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1513,7 +1621,7 @@
     <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="default" msgid="626414192825329708">"SD કાર્ડ"</string>
@@ -1539,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>
@@ -1548,14 +1656,15 @@
     <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="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="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="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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ઇનપુટ સહાયતા"</string>
@@ -1763,7 +1877,7 @@
     <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_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>
@@ -1857,7 +1971,7 @@
     <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_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">"તમારી ક્રિયાઓનું નિરીક્ષણ કરો"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"એક ઍપ્લિકેશન સાથે ક્રિયા પ્રતિક્રિયા કરતી વખતે સૂચનાઓ પ્રાપ્ત કરો."</string>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
@@ -1953,10 +2111,11 @@
     <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">"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_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>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2113,7 +2274,7 @@
     <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_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>
@@ -2132,17 +2293,17 @@
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN અને ઍપ્લિકેશનો માટે ઇન્સ્ટૉલ કરેલ"</string>
     <string name="credential_for_wifi" msgid="6228425986551591864">"Wi-Fi માટે ઇન્સ્ટૉલ કરેલ"</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_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">"તમે ઓળખપત્ર સંગ્રહનો ઉપયોગ કરી શકો છો તે પહેલાં તમારે લૉક સ્ક્રીન PIN કે પાસવર્ડ સેટ કરવો પડશે."</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>
@@ -2222,15 +2383,15 @@
     <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="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="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>
@@ -2238,7 +2399,7 @@
     <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="sync_menu_sync_now" msgid="6154608350395805683">"હમણાં સિંક કરો"</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">
 %1$s</xliff:g>"</string>
@@ -2261,15 +2422,15 @@
     <!-- 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="enter_pin" msgid="5305333588093263790">"Android પ્રારંભ કરવા માટે, તમારો PIN દાખલ કરો"</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_pin" msgid="755720788765259382">"ખોટો PIN"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"તપાસી રહ્યું છે..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android પ્રારંભ કરી રહ્યાં છીએ…"</string>
     <string name="delete" msgid="4219243412325163003">"કાઢી નાખો"</string>
@@ -2295,13 +2456,13 @@
     <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_sim_cards" msgid="6410498422797244073">"સિમ કાર્ડ"</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>
@@ -2326,11 +2487,11 @@
     <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" 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_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>
@@ -2358,7 +2519,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>
@@ -2420,7 +2581,7 @@
     <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" 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_none" msgid="9214462857336483711">"કોઈ નહીં"</string>
@@ -2467,8 +2628,8 @@
       <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">
@@ -2484,7 +2645,7 @@
     <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_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>
@@ -2513,7 +2674,7 @@
     <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="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>
@@ -2561,7 +2722,7 @@
     <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"જ્યારે તમે ટેપ કરો અને ચૂકવણી કરો ત્યારે હંમેશાં <xliff:g id="APP_0">%1$s</xliff:g> ને બદલે <xliff:g id="APP_1">%2$s</xliff:g> નો ઉપયોગ કરીએ?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"પ્રતિબંધો"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"પ્રતિબંધો દૂર કરો"</string>
-    <string name="restriction_menu_change_pin" msgid="740081584044302775">"પિન બદલો"</string>
+    <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>
@@ -2582,7 +2743,7 @@
     <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="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"વધુ સારો 4G LTE મોડ"</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>
@@ -2610,10 +2771,10 @@
     <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>
-    <string name="sim_settings_title" msgid="6822745211458959756">"સિમ કાર્ડ"</string>
+    <string name="sim_setup_wizard_title" msgid="1732682852692274928">"SIM કાર્ડ્સ"</string>
+    <string name="sim_settings_title" msgid="6822745211458959756">"SIM કાર્ડ્સ"</string>
     <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" 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>
@@ -2621,7 +2782,7 @@
     <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">"સિમ કાર્ડ પસંદ કરો"</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>
     <string name="sim_slot_empty" msgid="8964505511911854688">"SIM ખાલી છે"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"SIM નું નામ"</string>
@@ -2630,10 +2791,10 @@
     <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_card_select_title" msgid="6668492557519243456">"સિમ કાર્ડ પસંદ કરો"</string>
+    <string name="sim_card_select_title" msgid="6668492557519243456">"SIM કાર્ડ પસંદ કરો"</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_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_outgoing_call_title" msgid="1019763076116874255">"આઉટગોઇંગ કૉલ્સ માટે SIM"</string>
@@ -2643,7 +2804,7 @@
     <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>
+    <string name="sim_notification_title" msgid="6272913297433198340">"SIM કાર્ડ્સ બદલાયા છે."</string>
     <string name="sim_notification_summary" msgid="8858043655706669772">"સેટ કરવા માટે ટૅપ કરો"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"આ માટે પસંદગીનું SIM"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"દર વખતે પૂછો"</string>
@@ -2654,22 +2815,25 @@
       <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_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>
     <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_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>
@@ -2680,7 +2844,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">"ઓળખકર્તા, ઇનપુટ, વાણી, બોલો, ભાષા, હેન્ડ્સફ્રી, હેંડ ફ્રી, ઓળખાણ, અપમાનકારક, શબ્દ, ઑડિઓ, ઇતિહાસ, Bluetooth હેડસેટ"</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>
@@ -2696,26 +2860,32 @@
     <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">"ઓપ્ટિમાઇઝેશન્સને અવગણો, ડોઝ, ઍપ્લિકેશન સ્ટેન્ડબાય"</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_lockscreen" msgid="5746561909668570047">"અનલૉક કરવા માટે સ્લાઇડ કરો, પાસવર્ડ, પેટર્ન, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"કાર્ય પડકાર, કાર્ય, પ્રોફાઇલ"</string>
-    <string name="keywords_unification" msgid="1922900767659821025">"કાર્યાલયની પ્રોફાઇલ, સંચાલિત પ્રોફાઇલ, એકીકૃત કરો, એકીકરણ, કાર્ય, પ્રોફાઇલ"</string>
+    <string name="keywords_unification" msgid="1922900767659821025">"કાર્ય પ્રોફાઇલ, સંચાલિત પ્રોફાઇલ, એકીકૃત કરો, એકીકરણ, કાર્ય, પ્રોફાઇલ"</string>
     <string name="keywords_gesture" msgid="5696040361482126337">"હાવભાવ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ચુકવણી કરો, ટૅપ કરો, ચુકવણીઓ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"બૅકઅપ, બૅક અપ"</string>
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"વાઇ-ફાઇ NFC ટૅગ સેટ કરો"</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>
     <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>
+    <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_dashboard_summary" msgid="3402435125958012986">"વૉલ્યૂમ, વાઇબ્રેશન, ખલેલ પાડશો નહીં"</string>
@@ -2733,7 +2903,7 @@
     <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="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>
@@ -2760,8 +2930,8 @@
     <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="sound_work_settings" msgid="6774324553228566442">"કાર્યાલયની પ્રોફાઇલની ધ્વનિઓ"</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="6207040454949823153">"કાર્ય અને વ્યક્તિગત પ્રોફાઇલો માટે ધ્વનિ સમાન રહે છે"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"કાર્ય ફોન રિંગટોન"</string>
@@ -2770,7 +2940,7 @@
     <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="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>
@@ -2808,7 +2978,7 @@
     <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="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>
@@ -2833,8 +3003,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>
@@ -2855,12 +3023,12 @@
     </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_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_channel_badge_title" msgid="2240827899882847087">"નોટિફિકેશન માટેનું ચિહ્ન બતાવો"</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>
@@ -2942,9 +3110,9 @@
     </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" msgid="7712038508173845101">"જ્યારે સ્ક્રીન ચાલુ હોય ત્યારે અવરોધિત કરો"</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" 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>
@@ -2957,34 +3125,29 @@
     <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>
+    <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">"અનપિન કરતાં પહેલાં PIN માટે પૂછો"</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="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_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_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_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>
     <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="imei_information_title" msgid="8499085421609752290">"IMEI માહિતી"</string>
@@ -2997,7 +3160,7 @@
     <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_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>
@@ -3095,6 +3258,12 @@
     <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>
+    <!-- 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>
@@ -3132,7 +3301,7 @@
     <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_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>
@@ -3140,7 +3309,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>
@@ -3187,8 +3356,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="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>
@@ -3200,8 +3370,6 @@
     <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_switch_title" msgid="3621381992793251070">"આ સ્ત્રોત તરફથી હોય તો મંજૂરી આપો"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"કૅમેરા માટે બે વાર મરડો"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"તમારા કાંડાને બે વાર મરડીને કૅમેરા ઍપ્લિકેશન ખોલો"</string>
@@ -3254,25 +3422,25 @@
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"સ્ક્રીનશૉટની મંજૂરી નથી"</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_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>
     <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_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_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth અને મોબાઇલ નેટવર્ક બંધ કરેલ છે. તમે ફોન કૉલ કે ઇન્ટરનેટ સાથે કનેક્ટ કરી શકતા નથી."</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_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_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_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_night_display_title" msgid="5599814941976856183">"રાત્રિ પ્રકાશ ચાલુ છે"</string>
     <string name="condition_night_display_summary" msgid="5443722724310650381">"સ્ક્રીનની રંગછટા પીળાશ પડતી નારંગી કરેલ છે. તે તમને ઊંઘવામાં સહાય કરી શકે છે."</string>
@@ -3296,8 +3464,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,8 +3484,8 @@
       <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>
@@ -3326,8 +3493,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">"તમારા ઉપકરણને પ્રારંભ કરવા માટે પિન આવશ્યક. જ્યારે બંધ હોય તે વખતે, આ ઉપકરણ કૉલ, સંદેશા, સૂચનાઓ અથવા એલાર્મ પ્રાપ્ત કરી શકતું નથી."</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>
@@ -3382,7 +3549,6 @@
     <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_warning" msgid="9086859595338944882">"તમને પ્રીમિયમ SMS નો શુલ્ક લાગી શકે છે અને તમારા કૅરિઅર બિલ્સમાં ઉમેરવામાં આવશે. જો તમે કોઇ ઍપ્લિકેશન માટે પરવાનગી સક્ષમ કરો, તો તમે તે ઍપ્લિકેશનનો ઉપયોગ કરીને પ્રીમિયમ SMS મોકલવા માટે સમર્થ હશો."</string>
@@ -3417,7 +3583,7 @@
     <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">
@@ -3434,7 +3600,7 @@
     </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>
-    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"હૅડસેટ"</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_headphone" msgid="26580326066627664">"હેડફોન"</string>
@@ -3447,28 +3613,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-hi/arrays.xml b/res/values-hi/arrays.xml
index e4d53f4..8a2f33c 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"अच्छा"</item>
     <item msgid="8986346415847956850">"बेहतरीन"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"हमेशा"</item>
-    <item msgid="844721238536786870">"केवल प्‍लग इन करने पर"</item>
-    <item msgid="1986753720941888596">"कभी नहीं"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"हमेशा"</item>
-    <item msgid="7433294150916905997">"केवल प्‍लग इन करने पर"</item>
-    <item msgid="1390404486722375028">"कभी नहीं"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"पिछले 30 दिन"</item>
     <item msgid="6600989128423965319">"उपयोग चक्र सेट करें..."</item>
@@ -258,7 +248,7 @@
     <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>
@@ -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>
@@ -285,7 +275,7 @@
     <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>
@@ -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>
@@ -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>
@@ -352,7 +342,7 @@
     <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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fa53173..c85a663 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -23,13 +23,13 @@
     <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="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="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 +41,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>
@@ -95,7 +96,7 @@
     <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_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">"ब्लूटूथ डिवाइस"</string>
@@ -106,10 +107,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">"आपको ब्लूटूथ सेटिंग में बदलाव करने की अनुमति नहीं है."</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> आस-पास के डिवाइसों को दिखाई देता है."</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>
@@ -118,10 +135,11 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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) -->
@@ -278,8 +301,8 @@
     <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="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>
@@ -315,7 +338,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="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 +352,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 +377,55 @@
     <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>
+    <!-- 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>
@@ -408,8 +446,8 @@
     <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>
@@ -449,9 +487,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_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>
@@ -473,7 +513,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलॉक आकार बदलें"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदलें"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलॉक पासवर्ड बदलें"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"पुनः प्रयास करें. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> में से <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> प्रयास."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"अंतिम प्रयास"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"यदि आप इस प्रयास में गलत कार्य पैटर्न डालेंगे, तो आपकी कार्य प्रोफ़ाइल और संबद्ध डेटा को इस डिवाइस से निकाल दिया जाएगा."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"यदि आप इस प्रयास में गलत कार्य पिन डालेंगे, तो आपकी कार्य प्रोफ़ाइल और संबद्ध डेटा को इस डिवाइस से निकाल दिया जाएगा."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"यदि आप इस प्रयास में कोई गलत कार्य पासवर्ड डालेंगे, तो आपकी कार्य प्रोफ़ाइल और संबद्ध डेटा को इस डिवाइस से निकाल दिया जाएगा."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"बहुत से गलत प्रयास. आपकी कार्य प्रोफ़ाइल और संबद्ध डेटा को इस डिवाइस से निकाल दिया जाएगा."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ख़ारिज करें"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"फिर से कोशिश करें. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> में से <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> कोशिश."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"आपका डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो इस उपयोगकर्ता को हटा दिया जाएगा"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो इस उपयोगकर्ता को हटा दिया जाएगा"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो इस उपयोगकर्ता को हटा दिया जाएगा"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो आपकी कार्य प्रोफ़ाइल और उसके डेटा को हटा दिया जाएगा"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो आपकी कार्य प्रोफ़ाइल और उसके डेटा को हटा दिया जाएगा"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो आपकी कार्य प्रोफ़ाइल और उसके डेटा को हटा दिया जाएगा"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"बहुत सारी गलत कोशिशें की गई हैं. इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"बहुत सारी गलत कोशिशें की गई हैं. इस उपयोगकर्ता को हटा दिया जाएगा."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"बहुत सारी गलत कोशिशें की गई हैं. इस कार्य प्रोफ़ाइल और इसके डेटा को हटा दिया जाएगा."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"खारिज करें"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"इसमें कम से कम <xliff:g id="COUNT">%d</xliff:g> वर्ण होने चाहिए"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"पिन में कम से कम <xliff:g id="COUNT">%d</xliff:g> अंक होने चाहिए"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"जारी रखें"</string>
@@ -578,24 +626,24 @@
     <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>
+      <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_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">"दूसरे डिवाइस से जोड़ना वाला कोड लिखें और फिर Return या Enter दबाएं"</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>
     <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_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>
@@ -609,7 +657,7 @@
     <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_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>
@@ -619,13 +667,29 @@
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"जोड़ दें"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"डिस्‍कनेक्‍ट करें"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"युग्‍मित और कनेक्‍ट करें"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"जुड़ा हुआ डिवाइस हटाएं"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"डिस्‍कनेक्‍ट करें और जुड़ा हुआ डिवाइस हटाएं"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"अयुग्‍मित करें"</string>
+    <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_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>
+    <!-- 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>
@@ -647,7 +711,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>
@@ -668,11 +732,11 @@
     <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_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">"अनुपलब्‍ध है क्‍योंकि NFC बंद है"</string>
-    <string name="android_beam_label" msgid="6257036050366775040">"Android बीम"</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">"वाई-फ़ाई"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"वाई-फ़ाई  चालू करें"</string>
@@ -701,7 +765,7 @@
     <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>
+    <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">"वाई-फ़ाई  ऑप्टिमाइज़ेशन"</string>
@@ -720,7 +784,7 @@
     <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>
+    <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>
@@ -732,7 +796,7 @@
     <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_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>
@@ -747,7 +811,6 @@
     <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">"वाई-फ़ाई डिसकनेक्ट है. 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>
@@ -784,7 +847,7 @@
     <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_turnoff_message" msgid="5538901671131941043">"इसे बंद करने के लिए, ओवरफ़्लो मेन्यू में बेहतर पर जाएं."</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>
@@ -793,7 +856,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">"वाई-फ़ाई इंटरनेट से नहीं जुड़ा है"</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>
@@ -809,8 +872,7 @@
       <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_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>
@@ -847,9 +909,28 @@
     <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>
+    <!-- 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_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">"हॉटस्‍पॉट को चालू किया जा रहा है…"</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,7 +976,8 @@
     <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>
@@ -904,12 +986,12 @@
     <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="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"सूचना के लिए आने वाले कॉल (इनकमिंग) की आवाज़ का इस्तेमाल करें"</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>
@@ -920,12 +1002,12 @@
     <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_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>
@@ -953,10 +1035,10 @@
     <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="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,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"सिम कार्ड लॉक सेटिंग"</string>
@@ -1037,7 +1140,7 @@
     <string name="sim_pin_change" msgid="6311414184279932368">"सिम पिन बदलें"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"सिम पिन"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"सिम कार्ड लॉक करें"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"सिम कार्ड से रोक हटाएं"</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>
@@ -1055,10 +1158,10 @@
     <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="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">गलत सिम PIN कोड, आपके पास <xliff:g id="NUMBER_1">%d</xliff:g> प्रयास शेष हैं.</item>
+      <item quantity="other">गलत सिम PIN कोड, आपके पास <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>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN खाली नहीं हो सकता."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC फ़ील्‍ड में 3 अंक होने चाहिए."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MCC फ़ील्‍ड में 2 या 3 अंक होने चाहिए."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"वाहक %s प्रकार के APN जोड़ने की अनुमति नहीं देता."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"डिफ़ॉल्‍ट APN सेटिंग पुनर्स्थापित हो रही हैं."</string>
     <string name="menu_restore" msgid="8260067415075573273">"डिफ़ॉल्ट पर रीसेट करें"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"डिफ़ॉल्‍ट APN सेटिंग रीसेट करना पूर्ण हुआ."</string>
@@ -1290,7 +1394,7 @@
       <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_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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD कार्ड मिटाएं"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"आंतरिक USB मेमोरी का सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्ड पर मौजूद सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs मिटाएं"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"फ़ोन पर सभी eSIM मिटाएं. इससे आपकी मोबाइल सेवा योजना बंद नहीं होगी."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"टैबलेट पर सभी eSIM मिटाएं. इससे आपकी मोबाइल सेवा योजना बंद नहीं होगी."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टेबलेट रीसेट करें"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फ़ोन रीसेट करें"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"आपकी सभी व्यक्तिगत जानकारी और डाउनलोड किए गए ऐप्स मिटाएं? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
@@ -1312,7 +1419,7 @@
     <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">"ब्लूटूथ टेदरिंग"</string>
@@ -1321,29 +1428,23 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1363,7 +1464,7 @@
     <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_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>
@@ -1376,7 +1477,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>
@@ -1408,7 +1509,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">"सिस्टम वेबव्यू लाइसेंस"</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>
@@ -1489,11 +1590,17 @@
     <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" msgid="4872012136210802181">"अज्ञात स्रोत"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"सभी ऐप्स स्रोतों को अनुमति दें"</string>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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" 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>
@@ -1510,7 +1617,7 @@
     </plurals>
     <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="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>
@@ -1539,7 +1646,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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SD कार्ड पर"</string>
+    <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>
@@ -1595,7 +1703,7 @@
     <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_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>
@@ -1606,8 +1714,8 @@
     <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">"यदि आप इस ऐप्लिकेशन को अक्षम करते हैं, तो हो सकता है कि दूसरे ऐप्लिकेशन अपेक्षित रूप से काम ना कर पाएं. आपका डेटा भी हटा दिया जाएगा."</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_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> से इंस्टॉल किया गया ऐप्लिकेशन"</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"इनपुट सहायता"</string>
@@ -1756,14 +1869,14 @@
     <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="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="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_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>
@@ -1775,15 +1888,15 @@
     <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_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">"स्क्रीन आवर्धन का नई जानकारी अपने आप पाएं"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"एेप ट्रांज़िशन पर स्क्रीन को बड़ा दिखाना अपडेट करें"</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_master_mono_title" msgid="4363806997971905302">"मोनो ऑडियो"</string>
@@ -1860,7 +1973,7 @@
     <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 +1986,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 +2056,46 @@
     <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>
@@ -1946,14 +2103,15 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -1975,21 +2133,21 @@
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"कुल बैटरी क्षमता"</string>
     <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_stop" msgid="649958863744041872">"बलपूर्वक रोकें"</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="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_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_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>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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="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>
@@ -2032,7 +2192,7 @@
     <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>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"बैटरी का प्रतिशत स्थिति बार में दिखाएं"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"प्रोसेस के आंकड़े"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"चल रही प्रक्रिया के बारे में आकंड़े"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"मेमोरी उपयोग"</string>
@@ -2073,16 +2233,16 @@
     <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>
-    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"बोलकर फ़ोन को निर्देश और आउटपुट सेटिंग"</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="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_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>
@@ -2124,7 +2284,7 @@
     <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="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>
@@ -2163,9 +2323,9 @@
     <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="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="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>
@@ -2182,7 +2342,7 @@
     <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">"वाई-फ़ाई  सेटअप"</string>
@@ -2219,7 +2379,7 @@
     <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>
+    <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>
@@ -2229,12 +2389,12 @@
     <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="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="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>
@@ -2277,14 +2437,14 @@
     <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_cycle" msgid="5652529796195787949">"डेटा खर्च की अवधि"</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>
@@ -2300,10 +2460,10 @@
     <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_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_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>
@@ -2330,21 +2490,21 @@
     <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_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_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_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_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>
@@ -2362,7 +2522,7 @@
     <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>
@@ -2375,7 +2535,7 @@
     <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>
@@ -2452,7 +2612,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>
@@ -2495,7 +2655,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>
@@ -2551,7 +2711,7 @@
     <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">"एक टैप करके और AMP के ज़रिये; भुगतान टर्मिनल पर, इससे भुगतान करें:"</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>
@@ -2562,16 +2722,16 @@
     <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="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>
@@ -2582,7 +2742,7 @@
     <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="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"बेहतर 4G LTE मोड"</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>
@@ -2596,7 +2756,7 @@
     <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_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>
@@ -2627,7 +2787,7 @@
     <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_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>
@@ -2636,7 +2796,7 @@
     <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>
-    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"किया जाने वाला कॉल (आउटगोइंग) के लिए सिम"</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>
@@ -2654,20 +2814,23 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, मोबाइल और इंटरनेट सेवा देने वाली कंपनी, वायरलेस, डेटा, 4g,3g, 2g, lte"</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>
@@ -2680,7 +2843,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">"रेट करें, भाषा, डिफ़ॉल्ट, बोलें, बोलना, tts, एक्सेस-योग्यता स्क्रीन रीडर, नेत्रहीन"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"घड़ी, सेना"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"रीसेट करें, पुन: स्‍थापित करें, फ़ैक्टरी"</string>
@@ -2693,22 +2856,28 @@
     <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_ignore_optimizations" msgid="6102579291119055029">"ऑप्टिमाइज़ेशन, बैटरी बचाएं (डोज़), ऐप स्टैंडबाय पर ध्यान न दें"</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="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">"वाई-फ़ाई  NFC टैग सेट करें"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिखने के लिए टैग टैप करें..."</string>
@@ -2725,7 +2894,7 @@
     <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_unknown_sound_title" msgid="2535027767851838335">"ऐप की ओर से दी जाने वाली ध्वनि"</string>
@@ -2743,7 +2912,7 @@
     <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_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>
@@ -2760,7 +2929,7 @@
     <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="6207040454949823153">"कार्य और व्यक्तिगत प्रोफ़ाइल के लिए ध्वनियां एक समान होती हैं"</string>
@@ -2782,16 +2951,16 @@
     <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>
+    <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="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="notification_importance_title" msgid="848692592679312666">"महत्‍व"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"ऐप्लिकेशन को तय करने दें"</string>
@@ -2805,17 +2974,17 @@
     <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="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="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="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>
@@ -2827,14 +2996,12 @@
     <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_empty_text" msgid="685224245260197779">"इंस्टॉल किए हुए किसी भी ऐप में पिक्चर में पिक्चर की सुविधा काम नहीं करती है"</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">"पीआईपी तस्वीर डालें"</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="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="manage_zen_access_title" msgid="2611116122628520522">"परेशान ना करें एक्सेस"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"इंस्टॉल किए गए किसी भी ऐप द्वारा परेशान ना करें ऐक्सेस का अनुरोध नहीं किया है"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
@@ -2856,13 +3023,13 @@
     <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="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="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>
@@ -2920,9 +3087,9 @@
     <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_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_when" msgid="2767193283311106373">"स्वचालित रूप से चालू"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कभी नहीं"</string>
@@ -2942,34 +3109,29 @@
     </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_off" msgid="5026854939192419879">"स्क्रीन बंद होने पर रोकें"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"परेशान न करें द्वारा मौन किए गए नोटिफ़िकेशन को स्क्रीन को चालू करने से या नोटिफ़िकेशन की रोशनी को पल्स करने से रोकें"</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_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_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_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="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 +3139,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>
@@ -2999,7 +3161,7 @@
     <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>
@@ -3024,8 +3186,8 @@
       <item quantity="other"><xliff:g id="COUNT_3">%d</xliff:g> में से <xliff:g id="COUNT_2">%d</xliff:g> अनुमतियां दी गईं</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
-      <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="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"कोई अनुमति नहीं दी गई"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"किसी अनुमति का अनुरोध नहीं किया गया"</string>
@@ -3040,7 +3202,7 @@
     <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="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>
@@ -3079,7 +3241,7 @@
     <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,6 +3257,12 @@
     <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>
+    <!-- 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>
@@ -3132,7 +3300,7 @@
     <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_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>
@@ -3140,7 +3308,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>
@@ -3173,7 +3341,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>
@@ -3187,8 +3355,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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"इस स्रोत से अनुमति दें"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"कैमरे के लिए दो बार मोड़ना"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"अपनी कलाई को दो बार मोड़कर कैमरा ऐप खोलें"</string>
@@ -3234,10 +3401,10 @@
     <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="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="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>
@@ -3270,7 +3437,7 @@
     <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_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>
@@ -3285,9 +3452,9 @@
     <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="ethernet_data_usage" msgid="5108764537574354616">"ईथरनेट डेटा खर्च"</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>
@@ -3296,14 +3463,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>
@@ -3313,22 +3479,22 @@
     <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>
+      <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="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="unrestricted_app_title" msgid="4465437191723332066">"असीमित डेटा खर्च"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"डेटा बचाने की सेटिंग चालू होने पर असीमित डेटा एक्सेस"</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="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 +3502,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>
@@ -3359,7 +3525,7 @@
     <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_extras" msgid="4188418723779942047">"अतिरिक्त"</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>
@@ -3382,10 +3548,9 @@
     <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_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>
@@ -3419,7 +3584,7 @@
     <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_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>
@@ -3434,7 +3599,7 @@
     </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>
-    <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"हेडसेट"</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_headphone" msgid="26580326066627664">"हेडफ़ोन"</string>
@@ -3447,37 +3612,64 @@
     <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_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_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>
+    <!-- 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>
+    <!-- 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 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>
-    <string name="assist_gesture_title" msgid="7746563137898655539">"सहायक जेस्चर"</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>
     <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="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="4051513950976670853">"झटपट ऐप्स"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"सभी लिंक एप्लिकेशन में खोलें, भले ही वे इंस्टॉल न हों"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-hr/arrays.xml b/res/values-hr/arrays.xml
index bf780f1..bcb125d 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobra"</item>
     <item msgid="8986346415847956850">"Izvrsna"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Uvijek"</item>
-    <item msgid="844721238536786870">"Samo kad je uključeno"</item>
-    <item msgid="1986753720941888596">"Nikad"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Uvijek"</item>
-    <item msgid="7433294150916905997">"Samo kad je priključen na napajanje"</item>
-    <item msgid="1390404486722375028">"Nikad"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Posljednjih 30 dana"</item>
     <item msgid="6600989128423965319">"Postavi ciklus uporabe..."</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e1b18d6..8e6749f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/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">"Promijeni"</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 i postat ćete razvojni programer.</item>
       <item quantity="few">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka i postat ćete razvojni programer.</item>
@@ -31,6 +30,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 +42,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 +108,26 @@
     <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>
+    <!-- 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 dopuštenje za promjenu postavki Bluetootha."</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> vidljiv je 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 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 +139,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +176,11 @@
     <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>
+    <!-- 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">"Odabir vremenske zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -331,7 +354,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 +380,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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 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>
+    <!-- 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 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>
+    <!-- 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">"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>
+    <!-- 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 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 +490,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 +562,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Izmijeni uzorak za otključavanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promijeni PIN za otključavanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni zaporku za otključavanje"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Pokušajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. pokušaj od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Posljednji pokušaj"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ako pri ovom pokušaju unesete netočan uzorak za posao, vaš će se radni profil i povezani podaci ukloniti s uređaja."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ako pri ovom pokušaju unesete netočan PIN za posao, vaš će se radni profil i povezani podaci ukloniti s uređaja."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ako pri ovom pokušaju unesete netočnu zaporku za posao, vaš će se radni profil i povezani podaci ukloniti s uređaja."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Previše netočnih pokušaja. Vaš radni profil i povezani podaci uklonit će se s uređaja."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Odbaci"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Pokušajte ponovo. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. pokušaj od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaši će se podaci izbrisati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ako pri sljedećem pokušaju unesete netočan uzorak, izbrisat će se podaci s ovog uređaja"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ako pri sljedećem pokušaju unesete netočan PIN, izbrisat će se podaci s ovog uređaja"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ako pri sljedećem pokušaju unesete netočnu zaporku, izbrisat će se podaci s ovog uređaja"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ako pri sljedećem pokušaju unesete netočan uzorak, ovaj će se korisnik izbrisati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ako pri sljedećem pokušaju unesete netočan PIN, ovaj će se korisnik izbrisati"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ako pri sljedećem pokušaju unesete netočnu zaporku, ovaj će se korisnik izbrisati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ako pri sljedećem pokušaju unesete netočan uzorak, izbrisat će se vaš radni profil i njegovi podaci"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ako pri sljedećem pokušaju unesete netočan PIN, izbrisat će se vaš radni profil i njegovi podaci"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ako pri sljedećem pokušaju unesete netočnu zaporku, izbrisat će se vaš radni profil i njegovi podaci"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Previše netočnih pokušaja. S uređaja će se izbrisati podaci."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Previše netočnih pokušaja. Ovaj će se korisnik izbrisati."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Previše netočnih pokušaja. Ovaj će se radni profil izbrisati zajedno sa svim svojim podacima."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Odbaci"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Broj znakova ne smije biti manji od <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Broj znamenki u PIN-u ne smije biti maji od <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
@@ -637,6 +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 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>
+    <!-- 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">"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>
@@ -758,7 +822,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sigurnosna postavka bežičnog usmjerivača (TKIP) nije podržana"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentifikacija nije uspjela. Pokušajte ponovo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Otkrivena je još jedna WPS sesija. Pokušajte ponovo za nekoliko minuta."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Prekinuta je veza s Wi‑Fi-jem. Otkazano je postavljanje WPS-a."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Naziv mreže"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Unesite SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sigurnost"</string>
@@ -822,7 +885,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 +921,28 @@
     <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>
+    <!-- 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_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 ž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 +989,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>
@@ -992,23 +1074,33 @@
     <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>
+    <!-- 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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"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>
@@ -1028,12 +1120,23 @@
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Da biste kontrolirali događaje dok je telefon na priključnoj stanici i/ili dok miruje, uključite čuvar zaslona."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kada pokrenuti"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Trenutni čuvar zaslona"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pokreni sad"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Započni sad"</string>
     <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>
+    <!-- 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">"Aktiviraj zaslon kada stigne obavijest"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Uvijek uključeno"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Prikazivanje vremena, ikona obavijesti i drugih informacija"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Smanjite ili povećajte tekst"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaklj. SIM kartice"</string>
@@ -1286,6 +1389,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>
@@ -1316,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">"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>
@@ -1338,26 +1445,20 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je Ušteda podataka uključena, ne možete upotrebljavati modemsko povezivanje ni prijenosne žarišne točke"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB-om"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB priključen, uključite za modemsko povezivanje"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Ograničeno"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Modemsko povezivanje nije moguće ako se upotrebljava USB pohrana"</string>
-    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nije priključen"</string>
-    <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Povežite se radi uključivanja"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Pogreška ograničenja USB-a"</string>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1491,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>
@@ -1505,6 +1606,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1565,6 +1672,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Pokrenuto"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Memorija USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD kartici"</string>
+    <string name="disabled" msgid="9206776641295849915">"Onemogućeno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nije instalirano za korisnika"</string>
     <string name="installed" msgid="3070865169422600098">"Instalirano"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
@@ -1625,7 +1733,7 @@
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obavijesti za ovu aplikaciju, možda ćete propustiti važna upozorenja i ažuriranja."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Trgovina"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Pojedinosti o aplikaciji"</string>
-    <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija instalirana iz trgovine <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija instalirana iz trgovine: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"Više informacija o aplikaciji <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Radnje aplikacija"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"U tijeku"</string>
@@ -1674,6 +1782,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Pomoć pri unosu"</string>
@@ -1894,6 +2007,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 +2078,46 @@
     <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>
+    <!-- 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">"Zaslon"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svjetiljka"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
@@ -1974,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">"Sustav"</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-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,6 +2185,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2680,17 +2841,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Zadane aplikacije"</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">"Pretraži postavke"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Pretraži postavke"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Postavke pretraživanja"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Postavke pretraživanja"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"Wi-Fi, wi-fi, mrežna veza"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekstna poruka, slanje SMS-a, poruke, slanje poruka"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilno, mobilna mreža, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
@@ -2735,6 +2899,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">"sigurnosno kopirati, 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">"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>
@@ -2744,7 +2914,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"U oznaku NFC ne mogu se zapisati podaci. Upotrijebite drugačiju oznaku."</string>
     <string name="default_sound" msgid="8821684447333687810">"Zadani zvuk"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Glasnoća zvona na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Glasnoća, vibracija, Ne ometaj"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Glasnoća, vibracija, Ne uznemiravaj"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Softver zvona postavljen na vibraciju"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Softver zvona postavljen na nečujno"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Glasnoća zvona na 80%"</string>
@@ -2778,10 +2948,10 @@
       <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 za Ne ometaj"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritetna dopuštenja"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Postavke načina Ne uznemiravaj"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritetni način dopušta samo sljedeće"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Pravila za \"Ne ometaj\""</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Pravila za \"Ne uznemiravaj\""</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ogr. zvuk i vibr. po potrebi"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prioritetno"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
@@ -2861,8 +3031,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>
@@ -2892,7 +3060,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"Dopusti točku obavijesti"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Prikaži točku obavijesti"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nadjačaj Ne ometaj"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Obavijesti će prekidati tišinu u načinu Ne ometaj kada je postavljen na \"Samo prioritetno\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Neka te obavijesti nastave prekidati kada je način Ne ometaj postavljen na Samo prioritetno"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom zaslonu"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritet"</string>
@@ -2997,11 +3165,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 +3172,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>
@@ -3079,7 +3242,7 @@
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguranje aplikacija"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Dozvole aplikacijama"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikacije koje koriste značajke <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Applikacije koje upotrebljavaju <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Dodirnite za aktivaciju"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Dvaput dodirnite bilo gdje na zaslonu da biste aktivirali uređaj"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Otvaranje veza"</string>
@@ -3131,6 +3294,13 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3394,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalacija nepoznatih aplikacija"</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>
@@ -3237,8 +3408,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Dopuštenje aplikacije za izmjenu postavki sustava"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Dopusti izmjenu postavki sustava"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"To dopuštenje omogućuje aplikaciji izmjenu postavki sustava."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Dopusti iz ovog izvora"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dvostruko obrtanje za fotoaparat"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvaranje aplikacije fotoaparata obrtanjem ručnog zgloba dvaput"</string>
@@ -3303,7 +3472,7 @@
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prijenosna Wi-Fi žarišna točka <xliff:g id="ID_1">%1$s</xliff:g> aktivna je, a Wi-Fi za ovaj uređaj nije uključen."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Način rada u zrakoplovu uklj."</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth i mobilna mreža isključeni su. Ne možete telefonirati niti se povezati s internetom."</string>
-    <string name="condition_zen_title" msgid="2679168532600816392">"\"Ne ometaj\" uključeno (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"\"Ne uznemiravaj\" uključeno (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Štednja baterije je uključena"</string>
     <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>
@@ -3334,8 +3503,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>
@@ -3357,7 +3525,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Ušteda podataka"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neograničen pristup podacima"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Neograničeni podaci"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Pozadinski su podaci isključeni"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Uključeno"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Isključeno"</string>
@@ -3369,7 +3537,7 @@
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Zahtijeva uzorak za pokretanje uređaja. Kada je isključeno, uređaj ne može primati pozive, poruke i obavijesti niti oglašavati alarm."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Zahtijeva PIN za pokretanje uređaja. Kada je isključeno, uređaj ne može primati pozive, poruke i obavijesti niti oglašavati alarm."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Zahtijeva zaporku za pokretanje uređaja. Kada je isključeno, uređaj ne može primati pozive, poruke i obavijesti niti oglašavati alarm."</string>
-    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Dodajte još jedan otisak prsta"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Dodaj još jedan otisak prsta"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Otključajte 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>
@@ -3423,7 +3591,6 @@
     <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="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>
@@ -3491,28 +3658,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatski"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Priručnik"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Oslobodi prostor odmah"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Pokreti"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Prečaci pokreta"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Brzi pokreti za upravljanje telefonom"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Brzi pokreti za upravljanje tabletom"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Brzi pokreti za upravljanje uređajem"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Otvaranje fotoaparata"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Da biste brzo otvorili fotoaparat, dvaput pritisnite tipku za uključivanje/isključivanje. Funkcionira na svim zaslonima."</string>
+    <!-- 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">"Prebacivanje fotoaparata"</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 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_pickup_title" product="default" msgid="818688002837687268">"Podizanje telefona za provjeru"</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 za provjeru telefona"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite da biste provjerili tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite da biste provjerili uređaj"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Da biste brzo pogledali obavijesti, podignite telefon."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Da biste brzo pogledali obavijesti, podignite tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Da biste brzo pogledali obavijesti, podignite uređaj."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Otisak prsta za obavijesti"</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">"Povlačenje prstom za obavijesti"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani uređaja."</string>
+    <!-- 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 biste otvorili fotoaparat"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Da biste automatski otvorili fotoaparat, podignite telefon u položaj za snimanje (vodoravno ili okomito). Funkcionira kada je telefon u stanju mirovanja ili zaključan."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotografirajte dok je telefon u mirovanju ili zaključan"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Pomoćni pokret"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Osjetljivost"</string>
@@ -3623,6 +3817,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 +3831,10 @@
     <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>
+    <!-- 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-hu/arrays.xml b/res/values-hu/arrays.xml
index 46f9234..6034bac 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Jó"</item>
     <item msgid="8986346415847956850">"Kiváló"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Mindig"</item>
-    <item msgid="844721238536786870">"Csak ha töltőn van"</item>
-    <item msgid="1986753720941888596">"Soha"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Mindig"</item>
-    <item msgid="7433294150916905997">"Csak ha töltőn van"</item>
-    <item msgid="1390404486722375028">"Soha"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Legutóbbi 30 nap"</item>
     <item msgid="6600989128423965319">"Ciklus beállítása…"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4bb8ba4..9011b67 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Elutasítás"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Bezárás"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Váltás"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Ismeretlen"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen.</item>
       <item quantity="one"><xliff:g id="STEP_COUNT_0">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Nincs engedélye a Bluetooth-beállítások módosítására."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Eszközei"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Fiókok"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Tartózkodási hely"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Fiókok"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Biztonság és hely"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Biztonság és hely"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Titkosítás és hitelesítési adatok"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon titkosítva"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Az eszköz titkosítva"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"Á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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Feloldási minta módosítása"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Próbálja újra. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. kísérlet, összesen: <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Utolsó próbálkozás"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Amennyiben most helytelen munkahelyi mintát ad meg, a rendszer eltávolítja munkaprofilját és a kapcsolódó adatokat erről az eszközről."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Amennyiben most helytelen munkahelyi PIN-kódot ad meg, a rendszer eltávolítja munkaprofilját és a kapcsolódó adatokat erről az eszközről."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Amennyiben most helytelen jelszót ad meg, a rendszer eltávolítja munkaprofilját és a kapcsolódó adatokat erről az eszközről."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Túl sok sikertelen próbálkozás. A rendszer eltávolítja munkaprofilját és a kapcsolódó adatokat erről az eszközről."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Elvetés"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Próbálja újra. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. kísérlet, összesen: <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Adatai törlődni fognak"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Amennyiben helytelen mintát ad meg a következő kísérletnél, a rendszer törli az adatokat erről az eszközről"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Amennyiben helytelen PIN-kódot ad meg a következő kísérletnél, a rendszer törli az adatokat erről az eszközről"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Amennyiben helytelen jelszót ad meg a következő kísérletnél, a rendszer törli az adatokat erről az eszközről."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Amennyiben helytelen mintát ad meg a következő kísérletnél, a rendszer törli ezt a felhasználót"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Amennyiben helytelen PIN-kódot ad meg a következő kísérletnél, a rendszer törli ezt a felhasználót"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Amennyiben helytelen jelszót ad meg a következő kísérletnél, a rendszer törli ezt a felhasználót."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Amennyiben helytelen mintát ad meg a következő kísérletnél, a rendszer törli munkaprofilját és a kapcsolódó adatokat"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Amennyiben helytelen PIN-kódot ad meg a következő kísérletnél, a rendszer törli munkaprofilját és a kapcsolódó adatokat"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Amennyiben helytelen jelszót ad meg a következő kísérletnél, a rendszer törli munkaprofilját és a kapcsolódó adatokat."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Túl sok sikertelen próbálkozás. A rendszer törli az adatokat az eszközről."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Túl sok sikertelen próbálkozás. A rendszer törli ezt a felhasználót."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Túl sok sikertelen próbálkozás. A rendszer törli ezt a munkaprofilt és a kapcsolódó adatokat."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Elvetés"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Legalább <xliff:g id="COUNT">%d</xliff:g> karakter hosszúnak kell lennie"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"A PIN-kódnak legalább <xliff:g id="COUNT">%d</xliff:g> számjegyből kell állnia"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Folytatás"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A vezeték nélküli router biztonsági beállítása (TKIP) nem támogatott."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Azonsítási hiba. Kérjük, próbálja újra."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Egy másik WPS-munkamenetet észleltünk. Kérjük, próbálkozzon újra néhány perc múlva."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi-kapcsolat bontva. WPS-beállítás visszavonva."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Hálózat neve"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID megadása"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Biztonság"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Kezdés ideje"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Befejezés ideje"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Be (<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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Képernyő felébresztése értesítés érkezésekor"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Mindig bekapcsolva"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Az idő, az értesítési ikonok és egyéb információk megjelenítése"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Szöveg nagyítása és kicsinyítése"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kártya lezárási beállításai"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-kártya törlése"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Minden adat, például zenék és képek törlése a belső USB-tárról"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Minden adat, például zenék és képek törlése az SD-kártyáról"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"e-SIM-kártyák törlése"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"A telefonon található összes e-SIM-kártya törlése. Ezzel nem szünteti meg mobil-előfizetését."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"A táblagépen található összes e-SIM-kártya törlése. Ezzel nem szünteti meg mobil-előfizetését."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Táblagép visszaállítása"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon visszaállítása"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Törli az összes személyes információt és letöltött alkalmazást? A műveletet nem lehet visszavonni."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Futó"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-tár"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Az SD-kártyán"</string>
+    <string name="disabled" msgid="9206776641295849915">"Letiltva"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nincs telepítve e felh.-hoz"</string>
     <string name="installed" msgid="3070865169422600098">"Telepítve"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nincsenek alkalmazások."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Képernyő"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Zseblámpa"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2656,17 +2816,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Alapértelmezett alkalmazások"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Nyelvek, idő, biztonsági másolat, frissítések"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Beállítások"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Keresés a beállításokban"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Keresés a beállításokban"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Keresési beállítások"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Keresési beállítások"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, hálózati kapcsolat"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"szöveges üzenet, szöveges üzenet küldése, üzenetek, üzenetváltás"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilhálózat, mobil, mobilszolgáltató, vezeték nélküli, adat, 4g, 3g, 2g, lte"</string>
@@ -2711,6 +2874,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"kézmozdulat"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"fizetés, koppintás, kifizetések"</string>
     <string name="keywords_backup" msgid="470070289135403022">"biztonsági másolat, biztonsági mentés"</string>
+    <!-- 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-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>
@@ -2835,8 +3004,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>
@@ -2967,11 +3134,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 +3141,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 +3259,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3357,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Ismeretlen alkalmazások telepítése"</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>
@@ -3202,8 +3371,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Alkalmazásengedély rendszerbeállítások módosítására"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Rendszerbeállítások módosításának engedélyezése"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ez az engedély lehetővé teszi az alkalmazás számára a rendszerbeállítások módosítását."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Igen"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nem"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Engedélyezés ebből a forrásból"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"A kamera eléréshez forgassa kétszer a csuklóját"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Nyissa meg a Fényképezőgép alkalmazást kétszeri csuklófordítással"</string>
@@ -3298,8 +3465,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 +3485,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>
@@ -3384,7 +3550,6 @@
     <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="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>
@@ -3449,28 +3614,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatikus"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Kézi"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Szabadítson fel tárhelyet most"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Kézmozdulatok"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Kézmozdulatos parancsok"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gyors kézmozdulatok telefonja kezeléséhez"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gyors kézmozdulatok táblagépe kezeléséhez"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gyors kézmozdulatok eszköze kezeléséhez"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kamera megnyitása"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"A kamera gyors megnyitásához nyomja meg a bekapcsológombot kétszer. Bármelyik képernyőről működik."</string>
+    <!-- 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">"Kameraváltás"</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">"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>
+    <!-- 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">"Ellenőrzés a telefon felemelésével"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Ellenőrzés a táblagép felemelésével"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ellenőrzés az eszköz felemelésével"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Az értesítések gyors megtekintéséhez vegye a kezébe telefonját."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Az értesítések gyors megtekintéséhez vegye a kezébe táblagépét."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Az értesítések gyors megtekintéséhez vegye a kezébe eszközét."</string>
+    <!-- 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">"É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>
+    <!-- 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">"Eszköz felemelése a kamera megnyitásához"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"A kamera automatikus megnyitásához emelje a telefont olyan helyzetbe, mintha fényképezne vele (fekvő vagy álló módban). Akkor működik, ha a telefon alvó módban vagy zárolva van."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotók készítése, ha a telefon alszik vagy le van zárva"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Segítő kézmozdulat"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Érzékenység"</string>
@@ -3574,6 +3766,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 +3780,10 @@
     <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>
+    <!-- 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-hy/arrays.xml b/res/values-hy/arrays.xml
index 425ce3a..ae3c28b 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Լավ"</item>
     <item msgid="8986346415847956850">"Հիանալի"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Միշտ"</item>
-    <item msgid="844721238536786870">"Միայն երբ միացված է"</item>
-    <item msgid="1986753720941888596">"Երբեք"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Միշտ"</item>
-    <item msgid="7433294150916905997">"Միայն երբ միացված է"</item>
-    <item msgid="1390404486722375028">"Երբեք"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Վերջին 30 օրում"</item>
     <item msgid="6600989128423965319">"Սահմանել օգտագործման ցիկլը..."</item>
@@ -274,7 +264,7 @@
     <item msgid="1545733463471924009">"պատկերել վերին մասում"</item>
     <item msgid="3609046903962454582">"մուտք գործել ծանուցումներ"</item>
     <item msgid="4671646036128214513">"ֆոտոխցիկ"</item>
-    <item msgid="1097324338692486211">"ձայնագրել աուդիո ֆայլ"</item>
+    <item msgid="1097324338692486211">"ձայնագրել ձայնանյութ"</item>
     <item msgid="5031552983987798163">"նվագարկել ձայնանյութը"</item>
     <item msgid="8374996688066472414">"կարդալ սեղմատախտակը"</item>
     <item msgid="3045529469061083747">"փոփոխել սեղմատախտակը"</item>
@@ -341,7 +331,7 @@
     <item msgid="736541391767350377">"Պատկերել վերևի մասում"</item>
     <item msgid="5530815681721654194">"Մուտք գործել ծանուցումներ"</item>
     <item msgid="781213371706962767">"Տեսախցիկ"</item>
-    <item msgid="1720492593061838172">"Ձայնագրել աուդիո ֆայլ"</item>
+    <item msgid="1720492593061838172">"Ձայնագրել ձայնանյութ"</item>
     <item msgid="3493046322001257041">"Նվագարկել ձայնանյութը"</item>
     <item msgid="136815868796597058">"Կարդալ սեղմատախտակը"</item>
     <item msgid="5238692940326972503">"Փոփոխել սեղմատախտակը"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 9c5040fc..3295d2c 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -23,13 +23,13 @@
     <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="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="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 +41,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 +107,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&amp;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">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը տեսանելի է մոտակա սարքերի համար, քանի դեռ Bluetooth-ի կարգավորումները բաց են:"</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>
@@ -121,7 +138,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">"Հպեք` <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>
@@ -157,6 +175,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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
@@ -404,33 +442,33 @@
     <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_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">"Դուք կարող եք գաղտնագրել ձեր հաշիվները, կարգավորումները, ներբեռնած ծրագրերը և դրանց տվյալները, մեդիա և այլ ֆայլերը: Եթե ենթադրենք, որ դուք միացրել եք էկանի կողպումը (այն է՝ սահմանել եք թվային PIN կամ գաղտնաբառ), ապա պլանշետը գաղտնագրելուց հետո դուք պետք է ամեն անգամ այն միացնելիս ապակողպեք էկրանը՝ ապագաղտնագրելու համար: Միակ այլընտրանքը գործարանային տվյալների վերականգնումն է, որը կջնջի ձեր ողջ տվյալները:\n\nԳաղտնագրումը տևում է մեկ ժամ կամ ավելի: Դուք պետք է սկսեք լիցքավորված մարտկոցով՝ ողջ ընթացքում հեռախոսին միացրած պահելով լիցքավորիչը: Եթե ​​ընդհատեք, կարող եք կորցնել ձեր ինֆորմացիան մասնակի կամ ամբողջովին"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Կոդավորված են"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"Դուք կարող եք կոդավորել ձեր հաշիվները, կարգավորումները, ներբեռնած ծրագրերը և դրանց տվյալները, մեդիա և այլ ֆայլերը: Եթե ենթադրենք, որ դուք միացրել եք էկանի կողպումը (այն է՝ սահմանել եք թվային PIN կամ գաղտնաբառ), ապա պլանշետը կոդավորելուց հետո դուք պետք է ամեն անգամ այն միացնելիս ապակողպեք էկրանը՝ ապակոդավորելու համար: Միակ այլընտրանքը գործարանային տվյալների վերականգնումն է, որը կջնջի ձեր ողջ տվյալները:\n\nԿոդավորումը տևում է մեկ ժամ կամ ավելի: Դուք պետք է սկսեք լիցքավորված մարտկոցով՝ ողջ ընթացքում հեռախոսին միացրած պահելով լիցքավորիչը: Եթե ​​ընդհատեք, կարող եք կորցնել ձեր ինֆորմացիան մասնակի կամ ամբողջովին"</string>
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Դուք կարող եք ծածկագրել ձեր հաշիվները, կարգավորումները, ներբեռնված ծրագրերը և դրանց տվյալների, մեդիա և այլ ֆայլերը: Ձեր հեռախոսի ծածկագրումից հետո, եթե ստեղծել եք էկրանի կողպումը (այսինքն կաղապար կամ թվային PIN կամ գաղտնաբառ), պետք է ապակողպեք էկրանը` յուրաքանչյուր անգամ հեռախոսը միացնելիս այն ապածածկագրելու համար: Ապածածկագրելու այլ միակ տարբերակը գործարանային վերակայումն է` ջնջելով ձեր տվյալները:\n\nԾածկագրման համար անհրաժեշտ է մեկ կամ ավելի ժամ: Դուք պետք է կատարեք այն ամբողջովին լիցքավորված մարտկոցով և գործընթացի ժամանակ հեռախոսը լիցքավորիչին միացրած պահելով: Եթե դադարեցնեք այն, կկորցնեք որոշ տվյալներ կամ դրանք ամբողջությամբ:"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Գաղտնագրել պլանշետը"</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">"Կողպէկրանի PIN կամ գաղտնաբառ չկա"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Դուք պետք է կարգավորեք էկրանի կողպման PIN-ը կամ գաղտնաբառը գաղտնագրումը սկսելուց առաջ:"</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_dialog_need_password_message" msgid="4071395977297369642">"Դուք պետք է կարգավորեք էկրանի կողպման PIN-ը կամ գաղտնաբառը կոդավորումը սկսելուց առաջ:"</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_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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Փոխել ապակողպման նախշը"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Փոխել ապակողպման PIN-ը"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Փոխել ապակողպման գաղտնաբառը"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Փորձեք նորից: Փորձ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>՝ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-ից:"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Վերջին փորձը"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Եթե այս անգամ էլ մուտքագրեք սխալ աշխատանքային նախշ, ապա ձեր աշխատանքային պրոֆիլը և դրա հետ կապակցված տվյալները կհեռացվեն այս սարքից:"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Եթե այս անգամ էլ մուտքագրեք սխալ աշխատանքային PIN կոդ, ապա ձեր աշխատանքային պրոֆիլը և դրա հետ կապակցված տվյալները կհեռացվեն այս սարքից:"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Եթե այս անգամ էլ մուտքագրեք սխալ աշխատանքային գաղտնաբառ, ապա ձեր աշխատանքային պրոֆիլը և դրա հետ կապակցված տվյալները կհեռացվեն այս սարքից:"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Դուք կատարել եք չափից ավելի անհաջող փորձեր: Ձեր աշխատանքային պրոֆիլը և դրա հետ կապակցված տվյալները կհեռացվեն այս սարքից:"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Փակել"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Փորձեք նորից: Փորձ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>՝ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-ից:"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Ձեր տվյալները կջնջվեն"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Հաջորդ փորձի ընթացքում սխալ նախշ մուտքագրելու դեպքում սարքի տվյալները կջնջվեն"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Հաջորդ փորձի ընթացքում սխալ PIN մուտքագրելու դեպքում սարքի տվյալները կջնջվեն"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Հաջորդ փորձի ընթացքում սխալ գաղտնաբառ մուտքագրելու դեպքում սարքի տվյալները կջնջվեն"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Հաջորդ փորձի ընթացքում սխալ նախշ մուտքագրելու դեպքում օգտատերը կջնջվի"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Հաջորդ փորձի ընթացքում սխալ PIN մուտքագրելու դեպքում օգտատերը կջնջվի"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Հաջորդ փորձի ընթացքում սխալ գաղտնաբառ մուտքագրելու դեպքում այս օգտատերը կջնջվի"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Հաջորդ փորձի ընթացքում սխալ նախշ մուտքագրելու դեպքում ձեր աշխատանքային պրոֆիլը և դրա տվյալները կջնջվեն"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Հաջորդ փորձի ընթացքում սխալ PIN մուտքագրելու դեպքում աշխատանքային պրոֆիլը և դրա տվյալները կջնջվեն"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Հաջորդ փորձի ընթացքում սխալ գաղտնաբառ մուտքագրելու դեպքում աշխատանքային պրոֆիլը և դրա տվյալները կջնջվեն"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Չափից շատ սխալ փորձեր: Այս սարքի տվյալները կջնջվեն:"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Չափից շատ սխալ փորձեր։ Oգտատերը կջնջվի:"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Չափից շատ սխալ փորձեր։ Աշխատանքային պրոֆիլը և դրա տվյալները կջնջվեն:"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Փակել"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> գրանշան"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-ը պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> թվանշան"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Շարունակել"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"Ցանցի անունը"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Մուտքագրել SSID-ն"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Անվտանգություն"</string>
@@ -790,7 +853,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 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"Թեժ կետի միացում…"</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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1007,21 +1099,32 @@
     <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_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">"Հեռախոսը 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_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>
+    <!-- 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>
@@ -1080,8 +1183,8 @@
     <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" 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>
@@ -1226,7 +1329,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>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN-ը չի կարող դատարկ լինել:"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC դաշտը պետք է 3 նիշ ունենա:"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC դաշտը պետք է լինի առնվազն 2 կամ 3 թվանշան:"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Օպերատորը չի թույլատրում ավելացնել %s տեսակի APN-ներ:"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Լռելյայն APN կարգավորումների վերականգնում:"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Վերականգնել լռելյայնը"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Սկզբնական APN կարգավորումների վերակարգավորումն ավարտված է:"</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ջնջել SD քարտը"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ջնջել ներքին USB կրիչի բոլոր տվյալները, ինչպիսիք են երաժշտությունը կամ լուսանկարները"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ջնջել SD քարտի բոլոր տվյալները, ինչպիսիք են երաժշտությունը կամ լուսանկարները"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Ջնջել էլեկտրոնային SIM քարտերը"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ջնջել հեռախոսի բոլոր էլեկտրոնային SIM քարտերը: Սա չի չեղարկի ձեր բջջային ծառայությունների փաթեթը:"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ջնջել պլանշետի բոլոր էլեկտրոնային SIM քարտերը: Սա չի չեղարկի ձեր բջջային ծառայությունների փաթեթը:"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Վերակայել պլանշետը"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Վերակայել հեռախոսը"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Ջնջե՞լ բոլոր անձնական տեղեկությունները և ներբեռնված հավելվածները: Այլևս չեք կարող հետարկել այս գործողությունը:"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,13 +1592,19 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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="storage_label" msgid="8700867073480107253">"Տարածք"</string>
-    <string name="auto_launch_label" msgid="2669236885531442195">"Բացել ըստ կանխադրման"</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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SD քարտի վրա"</string>
+    <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>
@@ -1610,7 +1718,7 @@
     <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_summary" msgid="6464796332049327547">"Հավելվածը տեղադրվել է <xliff:g id="APP_STORE">%1$s</xliff:g>ից"</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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Ներածման աջակցում"</string>
@@ -1787,7 +1900,7 @@
     <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_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>
@@ -1854,11 +1967,11 @@
     <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> ծառայության միացումն ազդում է տվյալների գաղտնագրմանը, դուք պետք է հաստատեք ձեր PIN-ը:"</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների գաղտնագրմանը, դուք պետք է հաստատեք ձեր գաղտնաբառը:"</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">"Մշակել ձեր գործողությունները"</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 +1986,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 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"CPU-ի ընդհանուրը"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU առաջնատեսք"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Արթուն պահել"</string>
@@ -2005,8 +2163,10 @@
     <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>
+    <!-- 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_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>
@@ -2027,7 +2187,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Մեդիասերվեր"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Հավելվածի օպտիմալացում"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Մարտկոցի տնտեսում"</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_pct" msgid="8665950426992057191">"մատկոցի <xliff:g id="PERCENT">%1$s</xliff:g> լիցքի դեպքում"</string>
@@ -2280,14 +2440,14 @@
     <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" 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_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>
@@ -2368,7 +2528,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>
@@ -2654,9 +2814,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>
@@ -2664,7 +2827,7 @@
     <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="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>
@@ -2709,6 +2872,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>
@@ -2722,9 +2891,9 @@
     <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="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="notification_ringtone_title" msgid="4468722874617061231">"Ծանուցման կանխադրված ձայնը"</string>
@@ -2778,7 +2947,7 @@
     <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>
@@ -2831,14 +3000,12 @@
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Տեղադրված հավելվածներից ոչ մեկը չի աջակցում Նկար նկարի մեջ"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"նկարը նկարի մեջ, նկար, ննմ"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Նկար նկարի մեջ"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Թույլատրել «Նկար նկարի մեջ» ռեժիմը"</string>
-    <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="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="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>
@@ -2889,13 +3056,13 @@
     <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_enabled_toast" msgid="6910577623330811480">"Ինքնաշխատորեն կարգավորված է միացնել Չանհանգստացնել ընտրանքը նշված իրադարձությունների ժամանակ"</string>
-    <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Հետևյալ միջոցառումների ընթացքում՝"</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_calendar_any" msgid="6485568415998569885">"Ցանկացած օրացույց"</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_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>
     <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Կանոնը չի գտնվել:"</string>
@@ -2928,8 +3095,8 @@
     <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">
@@ -2965,11 +3132,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 +3139,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>
@@ -2990,7 +3152,7 @@
     <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="launch_by_default" msgid="1840761193189009248">"Բացել ըստ կանխադրվածի"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Հղումների բացում"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Բացել աջակցվող հղումները"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Բացել առանց հարցնելու"</string>
@@ -3000,11 +3162,11 @@
     <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="SIZE">%1$s</xliff:g>՝ սկսած <xliff:g id="DATE">%2$s</xliff:g>"</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>
@@ -3069,7 +3231,7 @@
     <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_app" msgid="6864503001385843060">"(Կանխադրված)"</string>
@@ -3093,9 +3255,15 @@
     <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="high_power_filter_on" msgid="3222265297576680099">"Առանց օպտիմալացման"</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>
+    <!-- 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>
@@ -3136,7 +3304,7 @@
     <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>
@@ -3175,20 +3343,21 @@
     <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_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="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="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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"Թույլ տալ այս աղբյուրից"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Տեսախցիկի բացում կրկնակի պտտման միջոցով"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Տեսախցիկի բացում դաստակի կրկնակի պտտման միջոցով"</string>
@@ -3296,8 +3463,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Տվյալների օգտագործման նախազգուշացում` <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Տվյալների օգտագործման նախազգուշացում` <xliff:g id="ID_1">%1$s</xliff:g> / Տվյալների օգտագործման սահմանաչափ` <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Վճարային ցիկլ"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Վճարային ցիկլն սկսվում է ամեն ամսվա <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Ամսական՝ սկսած <xliff:g id="ID_1">%1$s</xliff:g>-ից"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Ամեն ամիս, ամսի <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Ցանցային սահմանափակումներ"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
@@ -3317,7 +3483,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>
@@ -3329,7 +3495,7 @@
     <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" 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>
@@ -3382,7 +3548,6 @@
     <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_warning" msgid="9086859595338944882">"Վճարովի SMS-ները կարող են լրացուցիչ ծախսեր առաջացնել: Հավելվածին թույտվություն տալու դեպքում կկարողանաք դրա միջոցով վճարովի SMS-ներ ուղարկել։"</string>
@@ -3447,28 +3612,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-in/arrays.xml b/res/values-in/arrays.xml
index 4e762dd..b6c0aab 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Baik"</item>
     <item msgid="8986346415847956850">"Sangat bagus"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Selalu"</item>
-    <item msgid="844721238536786870">"Hanya ketika terhubung ke sumber daya"</item>
-    <item msgid="1986753720941888596">"Tidak pernah"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Selalu"</item>
-    <item msgid="7433294150916905997">"Hanya saat trhbng ke smbr daya"</item>
-    <item msgid="1390404486722375028">"Tidak pernah"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 hari terakhir"</item>
     <item msgid="6600989128423965319">"Setel alur penggunaan..."</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index fc470bb..7bc6d28 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Tolak"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Tutup"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Beralih"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Tinggal <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> langkah untuk menjadi pengembang.</item>
       <item quantity="one">Tinggal <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> langkah untuk menjadi pengembang.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Anda tidak memiliki izin untuk mengubah setelan Bluetooth."</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> dapat dilihat oleh perangkat lain di sekitar saat Setelan Bluetooth dibuka."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Perangkat Anda"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Tanggal &amp; waktu"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pilih zona waktu"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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,11 +487,13 @@
     <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>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Kunci profil kerja"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ubah layar kunci"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ubah layar gembok"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Ubah atau nonaktifkan pola, PIN, atau sandi keamanan"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pilih metode untuk mengunci layar"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Tidak ada"</string>
@@ -519,13 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ubah pola pembuka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ubah PIN pembuka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ubah sandi pembuka kunci"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Coba lagi. Mencoba <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kali dari <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> kali."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Mencoba terakhir kali"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jika Anda memasukkan pola yang salah saat mencoba sekarang, profil kerja dan data terkait akan dihapus dari perangkat ini."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jika Anda memasukkan PIN yang salah saat mencoba sekarang, profil kerja dan data terkait akan dihapus dari perangkat ini."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jika Anda memasukkan sandi yang salah saat mencoba sekarang, profil kerja dan data terkait akan dihapus dari perangkat ini."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Terlalu sering mencoba dengan salah. Profil kerja dan data terkait akan dihapus dari perangkat ini."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Tutup"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Coba lagi. Mencoba <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kali dari <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> kali."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Data akan dihapus"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jika Anda memasukkan pola yang salah saat mencoba lagi, data perangkat ini akan dihapus"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jika Anda memasukkan PIN yang salah saat mencoba lagi, data perangkat ini akan dihapus"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jika Anda memasukkan sandi yang salah saat mencoba lagi, data perangkat ini akan dihapus"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jika Anda memasukkan pola yang salah saat mencoba lagi, pengguna ini akan dihapus"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jika Anda memasukkan PIN yang salah saat mencoba lagi, pengguna ini akan dihapus"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jika Anda memasukkan sandi yang salah saat mencoba lagi, pengguna ini akan dihapus"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jika Anda memasukkan pola yang salah saat mencoba lagi, profil kerja dan datanya akan dihapus"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jika Anda memasukkan PIN yang salah saat mencoba lagi, profil kerja dan datanya akan dihapus"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jika Anda memasukkan sandi yang salah saat mencoba lagi, profil kerja dan datanya akan dihapus"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Terlalu sering mencoba dengan salah. Data perangkat akan dihapus."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Terlalu sering mencoba dengan salah. Pengguna ini akan dihapus."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Terlalu sering mencoba dengan salah. Profil kerja ini dan datanya akan dihapus."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Tutup"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Minimal berisi <xliff:g id="COUNT">%d</xliff:g> karakter"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN minimal <xliff:g id="COUNT">%d</xliff:g> digit"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Lanjutkan"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Setelan keamanan router nirkabel (TKIP) tidak didukung"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pengesahan gagal. Harap coba lagi."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Terdeteksi sesi WPS lainnya. Coba lagi setelah beberapa menit."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi terputus. Penyiapan WPS dibatalkan."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nama jaringan"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Masukkan SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Keamanan"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -917,7 +999,7 @@
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Nada sentuh dial pad"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"Bunyi ketukan"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Suara kunci layar"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Bergetar saat di-tap"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Bergetar saat diketuk"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Pengurang kebisingan"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Musik, video, game, &amp; media lainnya"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Nada dering &amp; notifikasi"</string>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Waktu mulai"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Waktu selesai"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Aktif / <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">"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>
@@ -1020,8 +1112,19 @@
     <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="doze_summary" msgid="3846219936142814032">"Mengaktifkan layar saat Anda menerima notifikasi"</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">"Membangunkan layar saat Anda menerima notifikasi"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Selalu aktif"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tampilkan waktu, ikon notifikasi, dan info lainnya"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Membuat teks menjadi lebih besar atau lebih kecil"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setelan kunci kartu SIM"</string>
@@ -1073,7 +1176,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID Peralatan"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versi pita basis"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versi kernel"</string>
-    <string name="build_number" msgid="3075795840572241758">"Nomor build"</string>
+    <string name="build_number" msgid="3075795840572241758">"Nomor bentukan"</string>
     <string name="selinux_status" msgid="6212165375172061672">"status SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Tidak tersedia."</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
@@ -1187,7 +1290,7 @@
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"<xliff:g id="NAME_0">^1</xliff:g> ini dikeluarkan dengan aman, tetapi masih ada. \n\nUntuk menggunakan <xliff:g id="NAME_1">^1</xliff:g> ini, Anda harus memasangnya terlebih dahulu."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"<xliff:g id="NAME_0">^1</xliff:g> ini rusak. \n\nUntuk menggunakan <xliff:g id="NAME_1">^1</xliff:g> ini, Anda harus menyiapkannya terlebih dahulu."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Perangkat ini tidak mendukung <xliff:g id="NAME_0">^1</xliff:g> ini. \n\nUntuk menggunakan <xliff:g id="NAME_1">^1</xliff:g> ini dengan perangkat ini, Anda harus menyiapkannya terlebih dahulu."</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"Setelah memformat, Anda dapat menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini di perangkat lain. \n\nSemua data di <xliff:g id="NAME_1">^1</xliff:g> ini akan dihapus. Pertimbangkan untuk melakukan backup terlebih dahulu. \n\n"<b>"Backup foto &amp; media lain"</b>" \nPindahkan file media ke penyimpanan alternatif di perangkat ini, atau transfer ke komputer menggunakan kabel USB. \n\n"<b>"Backup aplikasi"</b>" \nSemua aplikasi yang disimpan di <xliff:g id="NAME_6">^1</xliff:g> ini akan di-uninstal dan datanya akan dihapus. Untuk menyimpan aplikasi tersebut, pindahkan ke penyimpanan alternatif di perangkat ini."</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"Setelah memformat, Anda dapat menggunakan <xliff:g id="NAME_0">^1</xliff:g> ini di perangkat lain. \n\nSemua data di <xliff:g id="NAME_1">^1</xliff:g> ini akan dihapus. Pertimbangkan untuk mencadangkan terlebih dahulu. \n\n"<b>"Cadangkan foto &amp; media lain"</b>" \nPindahkan file media ke penyimpanan alternatif di perangkat ini, atau transfer ke komputer menggunakan kabel USB. \n\n"<b>"Cadangkan aplikasi"</b>" \nSemua aplikasi yang disimpan di <xliff:g id="NAME_6">^1</xliff:g> ini akan dicopot pemasangannya dan datanya akan dihapus. Untuk menyimpan aplikasi tersebut, pindahkan ke penyimpanan alternatif di perangkat ini."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Saat Anda mengeluarkan <xliff:g id="NAME_0">^1</xliff:g> ini, aplikasi yang tersimpan di situ tidak akan berfungsi lagi, dan file media yang tersimpan di situ baru dapat tersedia jika dicolokkan kembali."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ini diformat untuk berfungsi hanya di perangkat ini dan tidak akan berfungsi di perangkat lain."</string>
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"Untuk menggunakan aplikasi, foto, atau data dalam <xliff:g id="NAME">^1</xliff:g> ini, colokkan kembali. \n\nAtau, Anda dapat memilih untuk melupakan penyimpanan ini jika perangkat tidak tersedia. \n\nJika Anda memilih untuk melupakan, semua data dalam perangkat ini akan hilang selamanya. \n\nNanti Anda dapat memasang ulang aplikasi, tetapi datanya yang disimpan di perangkat ini akan hilang."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Lupakan <xliff:g id="NAME">^1</xliff:g>?"</string>
@@ -1273,6 +1376,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>
@@ -1285,7 +1389,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setel ulang?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Setel ulang jaringan tidak tersedia untuk pengguna ini"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Setelan jaringan telah disetel ulang"</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Reset ke setelan pabrik"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Kembalikan ke setelan pabrik"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
       <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> akun akan disetel ulang</item>
       <item quantity="one">1 akun akan disetel ulang</item>
@@ -1302,8 +1406,11 @@
     <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="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="erase_esim_storage" msgid="1886761972867390123">"Hapus eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Hapus semua eSIM di ponsel. Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Hapus semua eSIM di tablet. Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setel ulang tablet"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setel ulang ponsel"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Hapus semua informasi pribadi dan aplikasi yang didownload? Tindakan ini tidak dapat diurungkan!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Hapus semua"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"Penyetelan ulang tidak dilakukan karena layanan System Clear tidak tersedia."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1466,7 +1567,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Harus membuat pola untuk membuka layar"</string>
     <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_tactile_feedback_title" msgid="4389015658335522989">"Bergetar saat diketuk"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tombol daya 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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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 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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Menjalankan"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Penyimpanan USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pada kartu SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Dinonaktifkan"</string>
     <string name="not_installed" msgid="2797554494953450291">"Tidak dipasang untuk pengguna ini"</string>
     <string name="installed" msgid="3070865169422600098">"Terinstal"</string>
     <string name="no_applications" msgid="7336588977497084921">"Tidak ada aplikasi."</string>
@@ -1610,7 +1718,7 @@
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika Anda mematikan notifikasi untuk aplikasi ini, Anda dapat melewatkan pembaruan dan lansiran penting."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Toko Aplikasi"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detail aplikasi"</string>
-    <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikasi diinstal dari <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikasi dipasang dari <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"Info selengkapnya di <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Pengoperasian aplikasi"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Berjalan"</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Layar"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampu senter"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2151,7 +2311,7 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data pribadi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Cadangkan data saya"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Mencadangkan data aplikasi, sandi Wi-Fi, dan setelan lainnya ke server Google"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Akun backup"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Akun cadangan"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Sertakan data aplikasi"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Memulihkan cadangan setelan dan data ketika memasang ulang apl"</string>
@@ -2542,7 +2702,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Setelan ini memengaruhi semua pengguna di tablet ini."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ubah bahasa"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tap &amp; bayar"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Ketuk &amp; bayar"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Cara kerjanya"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Bayar dengan ponsel di toko"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"Pembayaran default"</string>
@@ -2579,7 +2739,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Pengelola Telepon"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Notifikasi darurat"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Siaran 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="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mode LTE 4G yang Ditingkatkan"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplikasi default"</string>
-    <string name="system_dashboard_summary" msgid="5797743225249766685">"Bahasa, waktu, backup, update"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"Bahawa, waktu, backup, update"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Setelan"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Telusuri setelan"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Telusuri setelan"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Setelan penelusuran"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Setelan penelusuran"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, sambungan jaringan"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, teks, pesan, perpesanan"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"seluler, mobile, operator sel, nirkabel, data, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"isyarat"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"bayar, tap, pembayaran"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <!-- 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">"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>
@@ -2735,15 +2904,15 @@
     <string name="other_sound_settings" msgid="3151004537006844718">"Suara lainnya"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Nada tombol nomor"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Suara kunci layar"</string>
-    <string name="charging_sounds_title" msgid="1132272552057504251">"Suara pengisian baterai"</string>
+    <string name="charging_sounds_title" msgid="1132272552057504251">"Suara pengisian daya"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Memasang suara di dok"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Suara sentuhan"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Bergetar saat di-tap"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Bergetar saat diketuk"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Dok pemutaran speaker"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Semua audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Hanya audio media"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"Senyap"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Suara peringatan"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Lansiran"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Getar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Aktifkan suara"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Aturan otomatis tidak diaktifkan"</string>
@@ -2781,9 +2950,9 @@
     <string name="notification_badging_title" msgid="5938709971403474078">"Izinkan titik notifikasi"</string>
     <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_show" msgid="6407527697810672847">"Menampilkan 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_disable" msgid="859628910427886715">"Jangan tampilkan notifikasi sama sekali"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Jangan menampilkan 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>
@@ -2827,14 +2996,12 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Saat perangkat dalam mode VR"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Kurangi buram (disarankan)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Kurangi kedipan"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Tidak ada aplikasi terinstal yang mendukung Picture-in-picture"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Gambar-dalam-gambar"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Tidak ada aplikasi ter-install yang mendukung Gambar-dalam-gambar"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"masukkan gambar"</string>
-    <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="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Gambar-dalam-gambar"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Izinkan gambar-dalam-gambar"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Mengizinkan aplikasi ini membuat jendela gambar-dalam-gambar saat aplikasi terbuka atau setelah Anda membiarkannya terbuka (misalnya, untuk melanjutkan menonton video). Jendela ini ditampilkan di atas aplikasi lain yang sedang digunakan."</string>
     <string name="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>
@@ -2862,7 +3029,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"Izinkan titik notifikasi"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Tampilkan titik notifikasi"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ganti mode Jangan Ganggu"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Izinkan notifikasi ini tetap ditampilkan jika mode Jangan Ganggu disetel ke Hanya Prioritas"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Izinkan notifikasi ini terus mengganggu jika mode Jangan Ganggu disetel ke Hanya Prioritas"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Di layar kunci"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Diblokir"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioritas"</string>
@@ -2891,9 +3058,9 @@
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Aturan otomatis disetel untuk mengaktifkan fitur Jangan Ganggu selama acara tertentu"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Selama acara untuk"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Selama acara untuk <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
-    <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"kalender mana saja"</string>
+    <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"kalender"</string>
     <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Jika balasannya adalah <xliff:g id="REPLY">%1$s</xliff:g>"</string>
-    <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Kalender mana saja"</string>
+    <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Kalender"</string>
     <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Jika balasannya adalah"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"Ya, Mungkin, atau Tidak dibalas"</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"Ya atau Mungkin"</string>
@@ -2943,10 +3110,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ubah ke mode hanya alarm hingga <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ubah ke mode selalu ganggu"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokir saat layar aktif"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Mencegah notifikasi yang dimatikan suaranya oleh mode Jangan Ganggu agar tidak mengintip atau muncul di layar"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Mencegah notifikasi yang dibisukan oleh mode Jangan Ganggu agar tidak diintip atau muncul di layar"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokir saat layar nonaktif"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Mencegah notifikasi yang dibisukan oleh mode Jangan Ganggu agar tidak mengaktifkan layar atau mengedipkan lampu notifikasi"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Mencegah notifikasi yang dimatikan suaranya oleh mode Jangan Ganggu agar tidak mengintip atau muncul di layar"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Mencegah notifikasi yang dibisukan oleh mode Jangan Ganggu agar tidak mengaktifkan layar"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Nonaktif"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Saat layar aktif"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Saat layar nonaktif"</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -2991,7 +3153,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Informasi relatif IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Buka secara default"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Membuka link"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Membuka tautan"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Buka tautan yang didukung"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Buka tanpa perlu bertanya"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Tautan yang didukung"</string>
@@ -3047,7 +3209,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikasi menggunakan <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Ketuk untuk membangunkan"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Ketuk layar dua kali di mana saja untuk membangunkan perangkat"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Membuka link"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Membuka tautan"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Jangan buka tautan yang didukung"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Buka <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Buka <xliff:g id="DOMAIN">%s</xliff:g> dan URL lain"</string>
@@ -3093,8 +3255,14 @@
     <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">"Pengoptimalan baterai"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Pemberitahuan penggunaan"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"Tampilkan semua penggunaan"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Tampilkan penggunaan perangkat penuh"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Tampilkan penggunaan aplikasi"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Banyak dipakai"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikasi berperilaku tidak normal</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> berperilaku tidak normal</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instal aplikasi yang tidak dikenal"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Izin mengubah setelan sistem aplikasi"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Izinkan mengubah setelan sistem"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Izin ini memungkinkan aplikasi mengubah setelan sistem."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Izinkan dari sumber ini"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Putar dua kali untuk kamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Membuka aplikasi kamera dengan memutar pergelangan tangan dua kali"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatis"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Kosongkan ruang sekarang"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Isyarat"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Pintasan gestur"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Isyarat cepat untuk mengontrol ponsel"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Isyarat cepat untuk mengontrol tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Isyarat cepat untuk mengontrol perangkat"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Beralih ke kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Untuk membuka kamera dengan cepat, tekan tombol daya dua kali. Berfungsi di layar mana pun."</string>
+    <!-- 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">"Balikkan kamera"</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">"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>
+    <!-- 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">"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="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>
+    <!-- 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">"Gesek sidik jari untuk melihat notifikasi"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk memeriksa notifikasi, gesek ke bawah pada sensor sidik jari di bagian belakang ponsel."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Untuk memeriksa notifikasi, gesek ke bawah pada sensor sidik jari di bagian belakang tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Untuk memeriksa notifikasi, gesek ke bawah pada sensor sidik jari di bagian belakang perangkat."</string>
+    <!-- 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">"Angkat untuk membuka kamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Untuk membuka kamera secara otomatis, angkat ponsel ke posisi mengambil foto (lanskap atau potret). Berfungsi jika ponsel dalam mode tidur atau terkunci."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ambil foto saat ponsel tidur atau terkunci"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gestur panduan"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensitivitas"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-is/arrays.xml b/res/values-is/arrays.xml
index e42514d..5f69299 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Gott"</item>
     <item msgid="8986346415847956850">"Frábært"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Alltaf"</item>
-    <item msgid="844721238536786870">"Aðeins þegar tækið er í sambandi"</item>
-    <item msgid="1986753720941888596">"Aldrei"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Alltaf"</item>
-    <item msgid="7433294150916905997">"Aðeins þegar tækið er í sambandi"</item>
-    <item msgid="1390404486722375028">"Aldrei"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Síðustu 30 dagar"</item>
     <item msgid="6600989128423965319">"Velja notkunartímabil..."</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index cf4371a..71fec05 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Hafna"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Loka"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Skipta"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Óþekkt"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Nú ertu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skrefi frá því að gerast þróunaraðili.</item>
       <item quantity="other">Nú ertu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skrefum frá því að gerast þróunaraðili.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Þú hefur ekki heimild til að breyta Bluetooth-stillingum."</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> er sýnilegt nálægum tækjum á meðan Bluetooth-stillingar eru opnar."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tækin þín"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Reikningar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Staðsetning"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Reikningar"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Öryggi og staðsetning"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Dulkóðun og skilríki"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Sími dulkóðaður"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Tæki dulkóðað"</string>
@@ -354,40 +378,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +488,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 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Breyta opnunarmynstri"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Breyta PIN-númeri"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Breyta aðgangsorði opnunar"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Reyndu aftur. Tilraun <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> af <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Síðasta tilraun"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ef þú slærð inn rangt vinnumynstur í þessari tilraun verða vinnusniðið þitt og tengd gögn fjarlægð úr þessu tæki."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ef þú slærð inn rangt PIN-númer fyrir vinnu í þessari tilraun verða vinnusniðið þitt og tengd gögn fjarlægð úr þessu tæki."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ef þú slærð inn rangt vinnuaðgangsorð í þessari tilraun verða vinnusniðið þitt og tengd gögn fjarlægð úr þessu tæki."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Of margar rangar tilraunir. Vinnusniðið þitt og tengd gögn verða fjarlægð úr þessu tæki."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Hunsa"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Reyndu aftur. Tilraun <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> af <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Gögnunum þínum verður eytt"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ef þú slærð inn rangt mynstur í næstu tilraun verður gögnum þessa tækis eytt"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ef þú slærð inn rangt PIN-númer í næstu tilraun verður gögnunum eytt af þessu tæki"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ef þú slærð inn rangt aðgangsorð í næstu tilraun verður gögnunum eytt af þessu tæki."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ef þú slærð inn rangt mynstur í næstu tilraun verður þessum notanda eytt"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ef þú slærð inn rangt PIN-númer í næstu tilraun verður þessum notanda eytt"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ef þú slærð inn rangt aðgangsorð í næstu tilraun verður þessum notanda eytt"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ef þú slærð inn rangt mynstur í næstu tilraun verður vinnusniðinu þínu og gögnum þess eytt"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ef þú slærð inn rangt PIN-númer í næstu tilraun verður vinnusniðinu þínu og gögnum þess eytt"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ef þú slærð inn rangt aðgangsorð í næstu tilraun verður vinnusniðinu þínu og gögnum þess eytt"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Of margar rangar tilraunir. Gögnum tækisins verður eytt."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Of margar rangar tilraunir. Þessum notanda verður eytt."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Of margar rangar tilraunir. Þessu vinnusniði og gögnum þess verður eytt."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Hunsa"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Verður að vera að minnsta kosti <xliff:g id="COUNT">%d</xliff:g> stafir"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-númerið verður að vera að minnsta kosti <xliff:g id="COUNT">%d</xliff:g> tölustafir"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Halda áfram"</string>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +812,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Öryggisstilling þráðlauss beinis (TKIP) er ekki studd"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Villa við sannvottun. Reyndu aftur."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Önnur WPS-lota greindist. Reyndu aftur eftir nokkrar mínútur."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi aftengt. Hætt við uppsetningu WPS."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Heiti nets"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Sláðu inn SSID-kennið"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Öryggi"</string>
@@ -810,7 +874,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 +910,28 @@
     <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>
+    <!-- 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_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">"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 +978,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>
@@ -980,23 +1063,33 @@
     <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>
+    <!-- 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">"Upphafstími"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Lokatími"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Kveikt / <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">"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 +1113,19 @@
     <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>
+    <!-- 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">"Vekja skjáinn þegar þú færð tilkynningar"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Alltaf kveikt"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Sýna tíma, tilkynningartákn og aðrar upplýsingar"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Leturstærð"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gera texta stærri eða minni"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Stillingar SIM-kortaláss"</string>
@@ -1273,6 +1377,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>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Hreinsa út af SD-korti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Eyða öllum gögnum í innbyggðu USB-geymslunni, svo sem tónlist eða myndum"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Eyða öllum gögnum á SD-korti, svo sem tónlist eða ljósmyndum"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Eyða eSIM-kortum"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Eyða öllum eSIM-kortum úr símanum. Með þessu segir þú ekki upp farsímaáskrift þinni."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Eyða öllum eSIM-kortum úr spjaldtölvunni. Með þessu segir þú ekki upp farsímaáskrift þinni."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Endurstilla spjaldtölvuna"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Endurstilla símann"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Eyða öllum persónuupplýsingum og sóttum forritum? Ekki er hægt að afturkalla þessa aðgerð."</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,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>
@@ -1491,6 +1593,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1658,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Í gangi"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-geymsla"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Á SD-korti"</string>
+    <string name="disabled" msgid="9206776641295849915">"Óvirkt"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ekki uppsett fyrir þennan notanda"</string>
     <string name="installed" msgid="3070865169422600098">"Uppsett"</string>
     <string name="no_applications" msgid="7336588977497084921">"Engin forrit."</string>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
+    <!-- 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">"Skjár"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Vasaljós"</string>
     <string name="power_camera" msgid="4976286950934622605">"Myndavél"</string>
@@ -1953,7 +2111,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2164,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2815,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Sjálfgefin forrit"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Tungumál, tími, öryggisafrit, uppfærslur"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Stillingar"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Leita í stillingum"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Leita í stillingum"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Leitarstillingar"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Leitarstillingar"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, nettenging"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"skilaboð, textaskilaboð, SMS-skilaboð, SMS"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"farsími, farsímakerfi, þráðlaust, gögn, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2873,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"bendingar"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"borga, ýta, greiðslur"</string>
     <string name="keywords_backup" msgid="470070289135403022">"afrita, afritun"</string>
+    <!-- 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">"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>
@@ -2833,8 +3003,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>
@@ -2965,11 +3133,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 +3140,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 +3258,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3356,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Setja upp óþekkt forrit"</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>
@@ -3200,8 +3370,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Heimild forrits til að breyta kerfisstillingum"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Leyfa breytingar á kerfisstillingum"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Þessi heimild leyfir forriti að breyta kerfisstillingum."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Já"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Leyfa frá þessum uppruna"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Tvöfaldur snúningur fyrir myndavél"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Opnaðu myndavélarforritið með því að snúa úlnliðnum tvisvar"</string>
@@ -3296,8 +3464,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 +3484,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>
@@ -3382,7 +3549,6 @@
     <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="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>
@@ -3447,28 +3613,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Sjálfvirkt"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handbók"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Losa geymslupláss núna"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Bendingar"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Bendingaflýtileiðir"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Flýtibendingar til að stjórna símanum"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Flýtibendingar til að stjórna spjaldtölvunni"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Flýtibendingar til að stjórna tækinu"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Opna myndavél"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Til að opna myndavélina hratt skaltu ýta tvisvar á aflrofann. Þetta virkar á hvaða skjá sem er."</string>
+    <!-- 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">"Skipt milli myndavéla"</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">"Ý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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Lyfta til að opna myndavélina"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Til að opna myndavélina sjálfkrafa skaltu lyfta símanum upp í myndatökustöðu (lárétta eða lóðrétta). Þetta virkar þó síminn sé í hvíldarstöðu eða læstur."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Taktu myndir þegar síminn er biðstöðu eða læstur"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Aðstoðarbending"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Næmi"</string>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-it/arrays.xml b/res/values-it/arrays.xml
index d766957..33a6e9f 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Buona"</item>
     <item msgid="8986346415847956850">"Ottima"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Solo quando collegato"</item>
-    <item msgid="1986753720941888596">"Mai"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Solo quando collegato"</item>
-    <item msgid="1390404486722375028">"Mai"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Ultimi 30 giorni"</item>
     <item msgid="6600989128423965319">"Imp. ciclo di utilizzo..."</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ba563ef..016aaaa 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Rifiuta"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Chiudi"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Cambia"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Ora ti mancano <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passaggi per diventare uno sviluppatore.</item>
       <item quantity="one">Ora ti manca <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passaggio per diventare uno sviluppatore.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Non sei autorizzato a modificare le impostazioni Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"I tuoi dispositivi"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data e ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Scegli il fuso orario"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Account"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Geolocalizzazione"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Account"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Sicurezza e posizione"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Sicurezza e posizione"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Crittografia e credenziali"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefono criptato"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositivo criptato"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"L\'iscrizione non è stata completata"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Timeout iscrizione mediante impronta digitale. Riprova."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Iscrizione mediante impronta digitale non riuscita. Riprova o utilizza un dito diverso."</string>
@@ -449,6 +487,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Impedisci ad altri di utilizzare il dispositivo senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Impedisci ad altri di utilizzare il telefono senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Scegli il metodo di backup per il blocco dello schermo"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opzioni di blocco schermo"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opzioni di blocco schermo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocco schermo"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/Subito dopo la sospensione"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> dopo sospensione"</string>
@@ -519,13 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Cambia sequenza di sblocco"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambia PIN di sblocco"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambia password di sblocco"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Riprova. Tentativo <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> di <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Ultimo tentativo"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se inserirai una sequenza di lavoro sbagliata per questo tentativo, il profilo di lavoro e i dati associati verranno rimossi da questo dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se inserirai un PIN di lavoro sbagliato per questo tentativo, il profilo di lavoro e i dati associati verranno rimossi da questo dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se inserirai una password di lavoro sbagliata per questo tentativo, il profilo di lavoro e i dati associati verranno rimossi da questo dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Troppi tentativi sbagliati. Il profilo di lavoro e i dati associati verranno rimossi da questo dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignora"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Riprova. Tentativo <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> di <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"I tuoi dati verranno eliminati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se al prossimo tentativo inserirai una sequenza sbagliata, i dati del dispositivo verranno eliminati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se al prossimo tentativo inserirai un PIN sbagliato, i dati del dispositivo verranno eliminati"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se al prossimo tentativo inserirai una password sbagliata, i dati del dispositivo verranno eliminati"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se al prossimo tentativo inserirai una sequenza sbagliata, questo utente verrà eliminato"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se al prossimo tentativo inserirai un PIN sbagliato, questo utente verrà eliminato"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se al prossimo tentativo inserirai una password sbagliata, questo utente verrà eliminato"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se al prossimo tentativo inserirai una sequenza sbagliata, il tuo profilo di lavoro e i relativi dati verranno eliminati"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se al prossimo tentativo inserirai un PIN sbagliato, il tuo profilo di lavoro e i relativi dati verranno eliminati"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se al prossimo tentativo inserirai una password sbagliata, il tuo profilo di lavoro e i relativi dati verranno eliminati"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Troppi tentativi sbagliati. I dati del dispositivo verranno eliminati."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Troppi tentativi sbagliati. Questo utente verrà eliminato."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Troppi tentativi sbagliati. Questo profilo di lavoro e i relativi dati verranno eliminati."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignora"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> caratteri"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Il PIN deve contenere almeno <xliff:g id="COUNT">%d</xliff:g> numeri"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"L\'impostazione di sicurezza del router wireless (TKIP) non è supportata"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Errore di autenticazione. Riprova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"È stata rilevata un\'altra sessione WPS. Riprova tra qualche minuto."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Rete Wi‑Fi disconnessa. Configurazione WPS annullata."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nome rete"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Inserisci l\'SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicurezza"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Ora inizio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ora fine"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"On/<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">"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>
@@ -1007,21 +1099,32 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalizza lo schermo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Scegli sfondo da"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Screensaver"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Durante la ricarica o quando inserito nel dock"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Durante la ricarica o l\'inserimento nel dock"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Entrambi i casi"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la ricarica"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando inserito nel dock"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Mai"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"OFF"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Attiva lo screensaver per controllare ciò che accade quando il telefono è inserito nel dock e/o in stand-by."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quando avviare"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quando iniziare"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Screensaver corrente"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Avvia adesso"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Inizia subito"</string>
     <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>
+    <!-- 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">"Lo schermo viene riattivato quando ricevi notifiche"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre attivo"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostra ora, icone di notifica e altre informazioni"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Ingrandisci o riduci il testo"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Impostazioni blocco SIM"</string>
@@ -1063,7 +1166,7 @@
     <string name="pin_failed" msgid="1848423634948587645">"Operazione con PIN della SIM non riuscita."</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stato tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Stato telefono"</string>
-    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aggiornamenti di sistema"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Aggiornamenti sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versione di Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Livello patch di sicurezza Android"</string>
@@ -1273,13 +1376,14 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Reimposta"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Reimpostazione della rete"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Verranno reimpostate tutte le impostazioni di rete, tra cui:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dati mobili"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_network_button_text" msgid="2035676527471089853">"Reimposta"</string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Reimposta impostazioni"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Reimpostare tutte le impostazioni di rete? Questa azione è irreversibile."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reimposta impostazioni"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reimpostare?"</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Cancella scheda SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Cancella tutti i dati nell\'archivio USB interno, come musica o foto"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Cancella tutti i dati sulla scheda SD, come musica o foto"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Resetta le eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Resetta tutte le eSIM del telefono. Il tuo piano di servizio dati mobile non verrà annullato."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Resetta tutte le eSIM del tablet. Il tuo piano di servizio dati mobile non verrà annullato."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Reimposta tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ripristina telefono"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Cancellare tutte le informazioni personali e le app scaricate? Questa azione è irreversibile."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1526,7 +1633,7 @@
     <string name="app_factory_reset" msgid="6635744722502563022">"Disinstalla aggiornamenti"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"Hai scelto di avviare questa applicazione per impostazione predefinita per alcune azioni."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"Hai scelto di consentire a questa applicazione di creare widget e di accedere ai relativi dati."</string>
-    <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nessuna impostazione predefinita."</string>
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nessuna app predefinita impostata."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Cancella predefinite"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Questa applicazione potrebbe non essere stata ideata per il tuo schermo. Puoi stabilire come adattarla al tuo schermo qui."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Chiedi all\'avvio"</string>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"In uso"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Archivio USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Scheda SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Disattivato"</string>
     <string name="not_installed" msgid="2797554494953450291">"Non installata per l\'utente"</string>
     <string name="installed" msgid="3070865169422600098">"Installata"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nessuna applicazione."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> servizi di stampa attivi</item>
       <item quantity="one">1 servizio di stampa attivo</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> processi di stampa</item>
+      <item quantity="one">1 processo di stampa</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Servizi di stampa"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nessun servizio installato"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nessuna stampante trovata"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Schermo"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Torcia"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotocamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2507,7 +2667,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"I profili con limitazioni non possono aggiungere account"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Elimina <xliff:g id="USER_NAME">%1$s</xliff:g> da dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Impostazioni schermata di blocco"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Aggiungi utenti da schermata blocco"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Aggiungi utenti dalla schermata di blocco"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuovo utente"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nuovo profilo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Eliminare te stesso?"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"App predefinite"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Lingue, ora, backup, aggiornamenti"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Impostazioni"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Cerca nelle impostazioni"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Cerca nelle impostazioni"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Impostazioni di ricerca"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Impostazioni di ricerca"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, connessione di rete"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"sms, invio di sms, messaggi, invio di messaggi"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellulare, dispositivo mobile, operatore cellulare, wireless, dati, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"paga, tocca, pagamenti"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <!-- 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">"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>
@@ -2734,7 +2903,7 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrazione per le chiamate"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Altri suoni"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toni tastierino"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Suoni blocco schermo"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Toni di blocco schermo"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"Suoni caricamento"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Suoni dock"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Suoni alla pressione"</string>
@@ -2799,7 +2968,7 @@
     <string name="notification_importance_min" msgid="5455049524984686275">"Senza suoneria o interruzione visiva"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Senza suoneria"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Con suoneria"</string>
-    <string name="notification_importance_high" msgid="2082429479238228527">"Suoneria e visualizzazione sullo schermo"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"Con suoneria e visualizzazione sullo schermo"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Bassa"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Media"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"Alta"</string>
@@ -2827,14 +2996,12 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Quando il dispositivo è in modalità VR"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Riduci sfocatura (consigliato)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Riduci sfarfallio"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture in picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Nessuna applicazione installata supporta la modalità Picture in picture"</string>
-    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in picture"</string>
-    <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="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Nessuna applicazione installata supporta la modalità Picture-in-picture"</string>
+    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</string>
+    <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="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>
@@ -2877,7 +3044,7 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Nome regola"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Inserisci il nome della regola"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Nome regola già in uso"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Aggiungi altre"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Aggiungi altri"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Elimina regola"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Scegli il tipo di regola"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Eliminare la regola \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -3035,7 +3197,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personali"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Lavoro"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"App: Tutte"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"App: disattivate"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"App: Disattivate"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorie: Importanza urgente"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorie: Importanza scarsa"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorie: Disattivate"</string>
@@ -3095,13 +3257,19 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
     <string name="high_power_system" msgid="7362862974428225301">"Ottimizzazione della batteria non disponibile"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Non applicare l\'ottimizzazione della batteria. La batteria potrebbe scaricarsi più rapidamente."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Consentire sempre di eseguire l\'app in background?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"Consentire sempre l\'esecuzione di <xliff:g id="APP_NAME">%1$s</xliff:g> in background potrebbe ridurre la durata della batteria. \n\nPuoi cambiare più tardi da Impostazioni &gt; App e notifiche."</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Consentire sempre l\'esecuzione di <xliff:g id="APP_NAME">%1$s</xliff:g> in background potrebbe ridurre la durata della batteria. \n\nPuoi cambiare più tardi da Impostazioni &gt; App &amp; Notifiche."</string>
     <string name="battery_summary" msgid="8044042095190688654">"Utilizzo dall\'ultima ricarica completa: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Gestione alimentazione"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Nessun utilizzo della batteria dall\'ultima ricarica completa"</string>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Installa app sconosciute"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Autorizzazione modifica impostazioni sistema"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Consenti modifica impostazioni di sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Questa autorizzazione consente a un\'app di modificare le impostazioni di sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Sì"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Consenti da questa fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Doppia rotazione per fotocamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Apri l\'app Fotocamera ruotando due volte il polso"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiche"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuali"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libera spazio ora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesti"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Scorciatoie per i gesti"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gesti rapidi per controllare il telefono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gesti rapidi per controllare il tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gesti rapidi per controllare il dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Apri la fotocamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Per aprire velocemente la fotocamera, premi due volte il tasto di accensione da qualsiasi schermata."</string>
+    <!-- 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">"Cambia fotocamera"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Solleva per aprire la fotocamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Per aprire la fotocamera in modo automatico, solleva il telefono come per scattare una foto (in orizzontale o in verticale). Funziona quando il telefono è in stand-by o bloccato."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Scatta foto con sospensione attiva o telefono bloccato"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistenza gesto"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilità"</string>
@@ -3572,6 +3764,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Vuoi rimuovere questa app istantanea?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Giochi"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"File audio"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Spazio occupato"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(disinstallato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disattivato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servizio di compilazione automatica"</string>
@@ -3585,5 +3778,10 @@
     <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>
+    <!-- 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-iw/arrays.xml b/res/values-iw/arrays.xml
index 282da43..b80b91f 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"טובה"</item>
     <item msgid="8986346415847956850">"מצוינת"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"תמיד"</item>
-    <item msgid="844721238536786870">"רק כאשר המכשיר מחובר"</item>
-    <item msgid="1986753720941888596">"אף פעם"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"תמיד"</item>
-    <item msgid="7433294150916905997">"רק כאשר המכשיר מחובר"</item>
-    <item msgid="1390404486722375028">"לעולם לא"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 הימים האחרונים"</item>
     <item msgid="6600989128423965319">"הגדר מחזור שימוש..."</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 61879cb..bad34c2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/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="two">אתה כעת במרחק של <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> צעדים מלהיות מפתח.</item>
       <item quantity="many">אתה כעת במרחק של <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">"חיבורים"</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">"‏ניהול תצורה של שיחות Wifi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"‏ניהול תצורה של נוכחות/EAB מופעל"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"הפעלה של רדיו סלולרי"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"‏הצג פנקס כתובות של SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"הצג מספרי חיוג קבועים"</string>
@@ -108,10 +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">"‏<xliff:g id="DEVICE_NAME">%1$s</xliff:g> גלוי למכשירים קרובים כאשר הגדרת Bluetooth פתוחה."</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">"הקש כדי ליצור התאמה עם <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) -->
@@ -333,7 +356,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 +383,55 @@
     <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>
+    <!-- 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>
@@ -455,6 +493,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 +565,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"שנה את קו ביטול הנעילה"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"שנה קוד גישה לביטול נעילה"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"שנה סיסמת ביטול נעילה"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"נסה שוב. ניסיון <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> מתוך <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ניסיון אחרון"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"אם תזין קו ביטול נעילה שגוי בפרופיל העבודה בניסיון הזה, פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"אם תזין קוד גישה שגוי בפרופיל העבודה בניסיון הזה, פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"אם תזין סיסמה שגויה בפרופיל העבודה בניסיון הזה, פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"נעשו יותר מדי ניסיונות שגויים. פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ביטול"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"נסה שוב. ניסיון <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> מתוך <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"הנתונים שלך יימחקו"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"אם תזין קו ביטול נעילה שגוי בניסיון הבא, הנתונים במכשיר יימחקו"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"אם תזין קוד גישה שגוי בניסיון הבא, הנתונים במכשיר יימחקו"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"אם תזין סיסמה שגויה בניסיון הבא, הנתונים במכשיר יימחקו"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"אם תזין קו ביטול נעילה שגוי בניסיון הבא, המשתמש הזה יימחק"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"אם תזין קוד גישה שגוי בניסיון הבא, המשתמש הזה יימחק"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"אם תזין סיסמה שגויה בניסיון הבא, המשתמש הזה יימחק"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"אם תזין קו ביטול נעילה שגוי בניסיון הבא, פרופיל העבודה והנתונים המשויכים אליו יימחקו"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"אם תזין קוד גישה שגוי בניסיון הבא, פרופיל העבודה והנתונים המשויכים אליו יימחקו"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"אם תזין סיסמה שגויה בניסיון הבא, פרופיל העבודה והנתונים המשויכים אליו יימחקו"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"נעשו יותר מדי ניסיונות שגויים. נתוני המכשיר יימחקו."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"נעשו יותר מדי ניסיונות שגויים. המשתמש הזה יימחק."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"נעשו יותר מדי ניסיונות שגויים. פרופיל העבודה והנתונים המשויכים אליו יימחקו."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"סגור"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"צריכה להכיל <xliff:g id="COUNT">%d</xliff:g> תווים לפחות"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"קוד הגישה צריך להיות באורך של <xliff:g id="COUNT">%d</xliff:g> ספרות לפחות"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"המשך"</string>
@@ -648,6 +696,22 @@
     <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>
+    <!-- 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>
@@ -769,7 +833,6 @@
     <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_ssid" msgid="5519636102673067319">"שם רשת"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"‏הזן את ה-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"אבטחה"</string>
@@ -834,7 +897,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>
@@ -871,9 +933,28 @@
     <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>
+    <!-- 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_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">"מפעיל נקודה לשיתוף אינטרנט…"</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 +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">"‏כתובת שתשמש כמיקום שלך לטובת שירותי החירום, אם תתקשר למוקד החירום באמצעות רשת Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
@@ -1004,24 +1086,34 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1029,7 +1121,7 @@
     <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="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_short" msgid="6140527286137331478">"בשני המצבים"</string>
@@ -1040,12 +1132,23 @@
     <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>
+    <!-- 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>
@@ -1299,6 +1402,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>
@@ -1330,6 +1434,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏מחק כרטיס SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏מחק את כל הנתונים באחסון ה-USB הפנימי, כגון פריטי מוזיקה או תמונות"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏מחק את כל הנתונים שבכרטיס ה-SD, כגון מוזיקה או תמונות"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"‏מחק את כרטיסי ה-eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‏מחיקה של כל כרטיסי ה-eSIM בטלפון. פעולה זו לא תבטל את תוכנית השירות הסלולרי שלך."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‏מחיקה של כל כרטיסי ה-eSIM בטאבלט. פעולה זו לא תבטל את תוכנית השירות הסלולרי שלך."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"איפוס טאבלט"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"איפוס טלפון"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"האם למחוק את כל המידע האישי שלך והאפליקציות שהורדת? לא ניתן לבטל את הפעולה!"</string>
@@ -1352,26 +1459,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1505,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>
@@ -1519,13 +1620,19 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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="storage_label" msgid="8700867073480107253">"אחסון"</string>
-    <string name="auto_launch_label" msgid="2669236885531442195">"ברירת מחדל"</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>
@@ -1540,7 +1647,7 @@
     </plurals>
     <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="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>
@@ -1550,7 +1657,7 @@
     <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="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>
@@ -1580,6 +1687,7 @@
     <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="default" msgid="1477351142334784771">"‏בכרטיס SD"</string>
+    <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>
@@ -1637,7 +1745,7 @@
     <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_summary" msgid="6464796332049327547">"האפליקציה הותקנה מ-<xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1689,6 +1797,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"סיוע בקלט"</string>
@@ -1769,9 +1882,9 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"‏האם ליצור Widget‏ ולאפשר גישה?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"‏לאחר יצירת ה-Widget‏, <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> ליצור Widgets ולגשת לנתונים שלהם"</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>
+    <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>
     <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> שניות"</string>
     <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> ימים <xliff:g id="HOURS">%2$d</xliff:g> שעות <xliff:g id="MINUTES">%3$d</xliff:g> דקות"</string>
     <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> שעות <xliff:g id="MINUTES">%2$d</xliff:g> דקות"</string>
@@ -1915,6 +2028,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>
@@ -1981,6 +2100,46 @@
     <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>
@@ -1995,7 +2154,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">"‏CPU - סך הכל"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU בחזית"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"שמור במצב פעיל"</string>
@@ -2017,7 +2177,7 @@
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"קיבולת סוללה כוללת"</string>
     <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_stop" msgid="649958863744041872">"אלץ עצירה"</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>
@@ -2047,6 +2207,8 @@
     <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>
+    <!-- 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>
@@ -2473,7 +2635,7 @@
     <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_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>
@@ -2620,10 +2782,10 @@
     <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">"‏הפעל את Call Manager"</string>
@@ -2660,7 +2822,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">"‏כרטיסי SIM"</string>
     <string name="sim_settings_title" msgid="6822745211458959756">"‏כרטיסי SIM"</string>
@@ -2708,17 +2870,20 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"‏סלולרי, נייד, ספק סלולרי, רשת אלחוטית, 4g, 3g, 2g, lte "</string>
@@ -2763,6 +2928,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"תנועה"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"שלם, הקש, תשלומים"</string>
     <string name="keywords_backup" msgid="470070289135403022">"‏גיבוי, לגבות, backup, back up"</string>
+    <!-- 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">"‏הגדר תג NFC של Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"הקש על תג כדי לכתוב..."</string>
@@ -2891,8 +3062,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>
@@ -2924,7 +3093,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>
@@ -2937,7 +3106,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>
@@ -2967,7 +3136,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>
@@ -3008,10 +3177,10 @@
     </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_off" msgid="5026854939192419879">"חסימה כשהמסך כבוי"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"הודעות שהושתקו במצב \'נא לא להפריע\' לא יפעילו את המסך או את האור המהבהב של ההודעה."</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_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_on_visual_interruptions" msgid="7373348148129140528">"כאשר המסך פועל"</string>
@@ -3031,11 +3200,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 +3207,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>
@@ -3056,7 +3220,7 @@
     <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="launch_by_default" msgid="1840761193189009248">"פתח כברירת מחדל"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"פתיחת קישורים"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"פתח קישורים נתמכים"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"פתח בלי לשאול"</string>
@@ -3169,6 +3333,14 @@
     <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>
+    <!-- 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>
@@ -3263,8 +3435,9 @@
     <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="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>
@@ -3276,8 +3449,6 @@
     <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_switch_title" msgid="3621381992793251070">"אפשר ממקור זה"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"סיבוב כפול להפעלת המצלמה"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"פתח את אפליקציית המצלמה על ידי סיבוב כפול של פרק כף היד"</string>
@@ -3374,8 +3545,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 +3569,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>
@@ -3466,7 +3636,6 @@
     <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="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>
@@ -3537,28 +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>
+    <!-- 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>
+    <!-- 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 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>
+    <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>
@@ -3676,6 +3872,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 +3886,10 @@
     <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>
+    <!-- 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-ja/arrays.xml b/res/values-ja/arrays.xml
index f1437c6..9076344 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"強"</item>
     <item msgid="8986346415847956850">"非常に強い"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"常に接続"</item>
-    <item msgid="844721238536786870">"電源接続時にのみ接続"</item>
-    <item msgid="1986753720941888596">"接続しない"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"常に使用"</item>
-    <item msgid="7433294150916905997">"電源接続時にのみ接続"</item>
-    <item msgid="1390404486722375028">"使用しない"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"過去30日間"</item>
     <item msgid="6600989128423965319">"使用サイクルを設定..."</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a7de562..e69784f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -23,13 +23,13 @@
     <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="other">デベロッパーになるまであと<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>ステップです。</item>
       <item quantity="one">デベロッパーになるまであと<xliff:g id="STEP_COUNT_0">%1$d</xliff:g>ステップです。</item>
     </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 +41,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 +107,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>
@@ -121,7 +138,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">"「<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 を ON にしようとしています"</string>
     <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」が Bluetooth を OFF にしようとしています"</string>
@@ -157,6 +175,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) -->
@@ -169,7 +192,7 @@
     <string name="proxy_settings_title" msgid="9049437837600320881">"プロキシ"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"消去"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"プロキシポート"</string>
-    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"プロキシをバイパス"</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_hostname_label" msgid="8490171412999373362">"プロキシのホスト名"</string>
@@ -329,7 +352,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 +377,55 @@
     <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">"OK"</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">"スマートフォンのロック解除方法として指紋を選択しています。スキップした場合は、後でセットアップする必要があります。セットアップの所要時間は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>
+    <!-- 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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ロック解除パターンの変更"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ロック解除PINの変更"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ロック解除パスワードの変更"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"もう一度お試しください。入力回数: <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"残り 1 回"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"仕事用パターンをあと 1 回間違って入力すると、仕事用プロファイルと関連データはこの端末から削除されます。"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"仕事用 PIN をあと 1 回間違って入力すると、仕事用プロファイルと関連データはこの端末から削除されます。"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"仕事用パスワードをあと 1 回間違って入力すると、仕事用プロファイルと関連データはこの端末から削除されます。"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"入力回数が上限を超えました。仕事用プロファイルと関連データはこの端末から削除されます。"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"閉じる"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"もう一度お試しください。入力回数: <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 回"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"データが削除されます"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"パターンをあと 1 回間違えると、この端末のデータが削除されます"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"PIN をあと 1 回間違えると、この端末のデータが削除されます"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"パスワードをあと 1 回間違えると、この端末のデータが削除されます"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"パターンをあと 1 回間違えると、このユーザーが削除されます"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"PIN をあと 1 回間違えると、このユーザーが削除されます"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"パスワードをあと 1 回間違えると、このユーザーが削除されます"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"パターンをあと 1 回間違えると、仕事用プロファイルと関連データが削除されます"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"PIN をあと 1 回間違えると、仕事用プロファイルと関連データが削除されます"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"パスワードをあと 1 回間違えると、仕事用プロファイルと関連データが削除されます"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"間違えた回数が上限を超えました。この端末のデータが削除されます。"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"間違えた回数が上限を超えました。このユーザーが削除されます。"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"間違えた回数が上限を超えました。この仕事用プロファイルと関連データが削除されます。"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"閉じる"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"<xliff:g id="COUNT">%d</xliff:g> 文字以上必要です"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN は <xliff:g id="COUNT">%d</xliff:g> 桁以上必要です"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"次へ"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"ネットワーク名"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSIDを入力します"</string>
     <string name="wifi_security" msgid="6603611185592956936">"セキュリティ"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"アクセスポイントを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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"ON / <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">"画面がOFFになったとき"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
@@ -1014,14 +1106,25 @@
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"なし"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"OFF"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"スマートフォンのホルダー装着時やスリープ時の動作を管理するには、スクリーン セーバーを ON にします。"</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>
+    <!-- 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">"常に ON"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"時刻、通知アイコンなどの情報を表示します"</string>
     <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"テキストのサイズを変更します"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APNは必ず指定してください。"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC欄は3桁で指定してください。"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC欄は2桁か3桁で指定してください。"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"携帯通信会社により、タイプ %s の APN の追加は許可されていません。"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"デフォルトのAPN設定を復元しています。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"初期設定にリセット"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"APN設定をリセットしました。"</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SDカード内データを消去"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"内部USBストレージ内の全データ（音楽、画像など）を消去します"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SDカード内の全データ（音楽、画像など）を消去します"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM を消去"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"スマートフォン上の eSIM をすべて消去します。この操作でモバイル サービス プランがキャンセルされることはありません。"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"タブレット上の eSIM をすべて消去します。この操作でモバイル サービス プランがキャンセルされることはありません。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"タブレットをリセット"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"モバイル端末をリセット"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"個人情報とダウンロードしたアプリをすべて削除しますか？この操作は元に戻せません。"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,13 +1592,19 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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="storage_label" msgid="8700867073480107253">"メモリ"</string>
-    <string name="auto_launch_label" msgid="2669236885531442195">"デフォルトで開く"</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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SDカード上"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"入力アシスタント"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"CPU合計"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUフォアグラウンド"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"スリープモードにしない"</string>
@@ -2004,15 +2162,17 @@
     <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_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_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> mAh）"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"フル充電以降の電池の使用状況"</string>
@@ -2658,17 +2818,20 @@
       <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>
     <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">"テキスト メッセージ、テキスト送信、メッセージ、SMS"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"モバイル、携帯通信会社、無線、データ、4G、3G、2G、LTE"</string>
@@ -2713,6 +2876,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>
@@ -2739,7 +2908,7 @@
     <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="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>
@@ -2831,14 +3000,12 @@
     <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_empty_text" msgid="685224245260197779">"ピクチャー イン ピクチャーに対応したアプリはインストールされていません"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"PIP"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"PIP に対応したアプリはインストールされていません"</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_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="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="manage_zen_access_title" msgid="2611116122628520522">"マナーモードへのアクセス"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"マナーモードへのアクセスをリクエストしたインストール済みアプリはありません"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
@@ -2865,8 +3032,8 @@
     <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>
@@ -2908,7 +3075,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>
@@ -2969,11 +3136,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>
@@ -2981,7 +3143,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>
@@ -2994,7 +3156,7 @@
     <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="launch_by_default" msgid="1840761193189009248">"既定で開く"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"リンクを開く"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"対応リンクを開く"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"確認なしで開く"</string>
@@ -3097,8 +3259,14 @@
     <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="other"><xliff:g id="NUMBER">%2$d</xliff:g> 個のアプリが正常に動作していません</item>
+      <item quantity="one">「<xliff:g id="APP">%1$s</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>
@@ -3191,8 +3359,9 @@
     <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="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>
@@ -3204,8 +3373,6 @@
     <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_switch_title" msgid="3621381992793251070">"この提供元のアプリを許可"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"2回ひねる動作でカメラアプリを開く"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"手首を2回ひねる動作でカメラアプリを開きます"</string>
@@ -3300,8 +3467,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 +3487,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>
@@ -3382,11 +3548,10 @@
     <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_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="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,28 +3616,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">"カメラをすばやく起動するには、電源ボタンを 2 回押します。どの画面からでも操作できます。"</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>
+    <!-- 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 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>
@@ -3576,6 +3768,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 +3782,10 @@
     <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>
+    <!-- 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-ka/arrays.xml b/res/values-ka/arrays.xml
index 13e21c2..1cc501a 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"კარგი"</item>
     <item msgid="8986346415847956850">"შესანიშნავი"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ყოველთვის"</item>
-    <item msgid="844721238536786870">"მხოლოდ ქსელიდან კვების მიღების დროს"</item>
-    <item msgid="1986753720941888596">"არასოდეს"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ყოველთვის"</item>
-    <item msgid="7433294150916905997">"მხოლოდ მაშინ, როცა მიერთებულია"</item>
-    <item msgid="1390404486722375028">"არასოდეს"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"ბოლო 30 დღე"</item>
     <item msgid="6600989128423965319">"გამოყენების ციკლის დაყენება..."</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 76beb3d..112027b 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -23,13 +23,13 @@
     <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="other">დეველოპერობამდე <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ნაბიჯი დაგრჩათ.</item>
       <item quantity="one">დეველოპერობამდე <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ნაბიჯი დაგრჩათ.</item>
     </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 +41,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 +107,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">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ჩანს ახლომდებარე მოწყობილობებზე, როდესაც Bluetooth პარამეტრები გახსნილია."</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>
@@ -121,7 +138,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">"შეეხეთ <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>
@@ -157,6 +175,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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
@@ -408,11 +446,11 @@
     <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">"შეგიძლიათ დაშიფროთ თქვენი ანგარიშები, პარამეტრები, ჩამოტვირთული აპები და სხვა მონაცემები, მედია და სხვა ფაილები. თქვენი ტაბლეტის დაშიფვრის შემდეგ, როცა სავარაუდოდ დაყენებული გექნებათ ეკრანის დაბლოკვა (ფორმა, რიცხვითი PIN-კოდი ან პაროლი), მოგიწევთ ეკრანის განბლოკვა ტაბლეტის გასაშიფრად ყოველი ჩართვისას. გაშიფვრის ერთადერთი სხვა საშუალება ქარხნული მონაცემების აღდგენაა, რაც წაშლის მთელ თქვენს მონაცემებს.\n\nდაშიფვრას ერთი საათი ან მეტი სჭირდება. უნდა დაიწყოთ დამუხტული ბატარეით და დატოვოთ ტაბლეტი მიერთებული მთელი პროცესის განმავლობაში. პროცესის შეწყვეტის შემთხვევაში ნაწილობრივ ან სრულად დაკარგავთ თქვენს მონაცემებს."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"შეგიძლიათ დაშიფროთ თქვენი ანგარიშები, პარამეტრები, ჩამოტვირთული აპები და სხვა მონაცემები,  მედია და სხვა ფაილები. თქვენი ტელეფონის დაშიფვრის შემდეგ, როცა სავარაუდოდ დაყენებული გექნებათ ეკრანის დაბლოკვა (ფორმა, რიცხვითი PIN-კოდი ან პაროლი), მოგიწევთ ეკრანის განბლოკვა ტელეფონის გასაშიფრად ყოველი ჩართვისას. გაშიფვრის ერთადერთი სხვა საშუალება ქარხნული მონაცემების აღდგენაა, რაც წაშლის მთელ თქვენს მონაცემებს.\n\nდაშიფვრას ერთი საათი ან მეტი სჭირდება. უნდა დაიწყოთ დამუხტული ბატარეით და დატოვოთ ტელეფონი მიერთებული მთელი პროცესის განმავლობაში. პროცესის შეწყვეტის შემთხვევაში ნაწილობრივ ან სრულად დაკარგავთ თქვენს მონაცემებს."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"შეგიძლიათ დაშიფროთ თქვენი ანგარიშები, პარამეტრები, ჩამოტვირთული აპები და სხვა მონაცემები, მედია და სხვა ფაილები. თქვენი ტაბლეტის დაშიფვრის შემდეგ, როცა სავარაუდოდ დაყენებული გექნებათ ეკრანის დაბლოკვა (ფორმა, რიცხვითი PIN-კოდი ან პაროლი), მოგიწევთ ეკრანის განბლოკვა ტაბლეტის გასაშიფრად ყოველი ჩართვისას. გაშიფვრის ერთადერთი სხვა საშუალება ქარხნული მონაცემების აღდგენაა, რაც წაშლის მთელ თქვენს მონაცემებს.\n\nდაშიფვრას ერთი საათი ან მეტი სჭირდება. უნდა დაიწყოთ დამუხტული ელემენტით და დატოვოთ ტაბლეტი მიერთებული მთელი პროცესის განმავლობაში. პროცესის შეწყვეტის შემთხვევაში ნაწილობრივ ან სრულად დაკარგავთ თქვენს მონაცემებს."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"შეგიძლიათ დაშიფროთ თქვენი ანგარიშები, პარამეტრები, ჩამოტვირთული აპები და სხვა მონაცემები,  მედია და სხვა ფაილები. თქვენი ტელეფონის დაშიფვრის შემდეგ, როცა სავარაუდოდ დაყენებული გექნებათ ეკრანის დაბლოკვა (ფორმა, რიცხვითი PIN-კოდი ან პაროლი), მოგიწევთ ეკრანის განბლოკვა ტელეფონის გასაშიფრად ყოველი ჩართვისას. გაშიფვრის ერთადერთი სხვა საშუალება ქარხნული მონაცემების აღდგენაა, რაც წაშლის მთელ თქვენს მონაცემებს.\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_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">"ეკრანის დაბლოკვის PIN კოდი ან პაროლი არ არის დაყენებული"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"დაშიფვრის დაწყებამდე უნდა დააყენოთ ეკრანის ჩაკეტვის PIN-კოდი ან პაროლი."</string>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"გასაღების ცვლილება"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"განბლოკვის PIN-ის შეცვლა"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"განბლოკვის პაროლის შეცვლა"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ცადეთ ხელახლა. მცდელობა <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-დან."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ბოლო მცდელობა"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ამ მცდელობისას სამსახურის ნიმუშის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და დაკავშირებული მონაცემები ამოიშლება ამ მოწყობილობიდან."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ამ მცდელობისას სამსახურის PIN-კოდის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და დაკავშირებული მონაცემები ამოიშლება ამ მოწყობილობიდან."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ამ მცდელობისას სამსახურის პაროლის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და დაკავშირებული მონაცემები ამოიშლება ამ მოწყობილობიდან."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"დაფიქსირდა მეტისმეტად ბევრი არასწორი მცდელობა. თქვენი სამსახურის პროფილი და დაკავშირებული მონაცემები ამოიშლება ამ მოწყობილობიდან."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"დახურვა"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ცადეთ ხელახლა. მცდელობა <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-დან."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"თქვენი მონაცემები წაიშლება"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"შემდეგი მცდელობისას განმბლოკავი ნიმუშის არასწორად შეყვანის შემთხვევაში, ამ მოწყობილობის მონაცემები წაიშლება"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"შემდეგი მცდელობისას PIN-კოდის არასწორად შეყვანის შემთხვევაში, ამ მოწყობილობის მონაცემები წაიშლება"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"შემდეგი მცდელობისას პაროლის არასწორად შეყვანის შემთხვევაში, ამ მოწყობილობის მონაცემები წაიშლება"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"შემდეგი მცდელობისას განმბლოკავი ნიმუშის არასწორად შეყვანის შემთხვევაში, ეს მომხმარებელი წაიშლება"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"შემდეგი მცდელობისას PIN-კოდის არასწორად შეყვანის შემთხვევაში, ეს მომხმარებელი წაიშლება"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"შემდეგი მცდელობისას პაროლის არასწორად შეყვანის შემთხვევაში, ეს მომხმარებელი წაიშლება"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"შემდეგი მცდელობისას განმბლოკავი ნიმუშის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და მისი მონაცემები წაიშლება"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"შემდეგი მცდელობისას PIN-კოდის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და მისი მონაცემები წაიშლება"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"შემდეგი მცდელობისას პაროლის არასწორად შეყვანის შემთხვევაში, თქვენი სამსახურის პროფილი და მისი მონაცემები წაიშლება"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"დაფიქსირდა ზედმეტად ბევრი არასწორი მცდელობა. შედეგად, ამ მოწყობილობის მონაცემები წაიშლება."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"დაფიქსირდა ზედმეტად ბევრი არასწორი მცდელობა. შედეგად, ეს მომხმარებელი წაიშლება."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"დაფიქსირდა ზედმეტად ბევრი არასწორი მცდელობა. შედეგად, სამსახურის ეს პროფილი და მისი მონაცემები წაიშლება."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"დახურვა"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"უნდა შეიცავდეს მინიმუმ <xliff:g id="COUNT">%d</xliff:g> სიმბოლოს"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-კოდი უნდა შედგებოდეს მინიმუმ <xliff:g id="COUNT">%d</xliff:g> ციფრისგან"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"გაგრძელება"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -706,7 +770,7 @@
     <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_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_cellular_data_fallback_summary" msgid="6375399280719867214">"მობილური ინტერნეტის გამოყენება, როცა Wi‑Fi-ს ინტერნეტთან წვდომა არ გააჩნია. შესაძლოა დაგეკისროთ მობილური ინტერნეტით სარგებლობის ხარჯები."</string>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"ქსელის სახელი"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"შეიყვანეთ SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"უსაფრთხოება"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"უსადენო ქსელი ჩართვა…"</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 +977,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>
@@ -980,26 +1062,36 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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="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>
@@ -1007,9 +1099,9 @@
     <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_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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1078,7 +1181,7 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"მიუწვდომელი"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"სტატუსი"</string>
     <string name="device_status" msgid="607405385799807324">"სტატუსი"</string>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"ბატარეის, ქსელის სტატუსი და სხვა ინფორმაცია"</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>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD ბარათის წაშლა"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"შიდა USB მეხსიერებიდან ყველა მონაცემების წაშლა, როგორიცაა მუსიკა ან ფოტოები"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"წაიშალოს SD ბარათის ყველა მონაცემი, როგორიცაა მუსიკა და ფოტოები"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM-ების ამოშლა"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ტელეფონზე არსებული ყველა eSIMs ამოიშლება, თუმცა ეს არ გააუქმებს თქვენს მოქმედ მობილურ სერვისს."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ტაბლეტზე არსებული ყველა eSIMs ამოიშლება, თუმცა ეს არ გააუქმებს თქვენს მოქმედ მობილურ სერვისს."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ტაბლეტის მონაცემების ჩამოყრა"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ტელეფონის საწყისი მდგომარეობის აღდგენა"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"გსურთ მთელი თქვენი პირადი ინფორმაციისა და ჩამოტვირთული აპების წაშლა? ამ მოქმედების გაუქმება შეუძლებელია!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SD ბარათზე"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"შეყვანის დამხმარე საშუალებები"</string>
@@ -1873,6 +1986,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>
@@ -1899,7 +2016,7 @@
     <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>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"ელემენტის მოხმარების მონაცემები მიუწვდომელია."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"დარჩენილია <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"დატენვამდე <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
@@ -1917,7 +2034,7 @@
     <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_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>
@@ -1939,6 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"CPU აქტიური რეჟიმი"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"დარჩეს აქტიური"</string>
@@ -1990,7 +2148,7 @@
     <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_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>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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>
@@ -2229,7 +2389,7 @@
     <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>
@@ -2336,7 +2496,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>
@@ -2654,9 +2814,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>
@@ -2664,7 +2827,7 @@
     <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="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">"ტექსტური შეტყობინება, SMS-ის გაგზავნა, შეტყობინებები, შეტყობინების გაგზავნა"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ფიჭური კავშირი, მობილური ინტერნეტი, უსადენო კავშირი, მონაცემები, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,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>
@@ -2752,7 +2921,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>
@@ -2827,18 +2996,16 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"როცა მოწყობილობა ვირტუალური რეალობის რეჟიმშია"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"გაბუნდოვნების შემცირება (რეკომენდებული)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"ციმციმის შემცირება"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"ეკრანი ეკრანში"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"დაინსტალირებული აპების მიერ „ეკრანი ეკრანში“ მხარდაჭერილი არ არის"</string>
+    <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_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="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="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>
@@ -2965,11 +3132,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 +3139,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>
@@ -2996,7 +3158,7 @@
     <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="SIZE">%1$s</xliff:g> გამოყენებულია <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>ში"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> გამოიყენება საცავში: <xliff:g id="STORAGE_TYPE">%2$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>
@@ -3093,12 +3255,18 @@
     <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="other"><xliff:g id="NUMBER">%2$d</xliff:g> აპი არასათანადოდ მუშაობს</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</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_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>
@@ -3187,8 +3355,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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"ამ წყაროდან დაშვება"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"ორმაგი მოტრიალება კამერისთვის"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"გახსენით კამერის აპი თქვენი მაჯის ორჯერ მოტრიალებით"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">1 აპს მონაცემთა შეუზღუდავად გამოყენების უფლება აქვს, როცა მონაცემთა დამზოგველი ჩართულია</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"მონაცემთა დამზოგველი"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"მონაცემებზე შეუზღ.წვდომა"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"მონაცემებზე შეუზღუდავი წვდომით"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ფონური მონაცემები გამორთულია"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ჩართული"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"გამორთული"</string>
@@ -3382,7 +3548,6 @@
     <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_warning" msgid="9086859595338944882">"პრემიუმ SMS შეტყობინებებისთვის შეიძლება დამატებითი საფასურის გადახდა მოგიწიოთ. აპისთვის ამ ნებართვის მიცემის შემთხვევაში, თქვენ მისი მეშვეობით პრემიუმ SMS შეტყობინებების გაგზავნას შეძლებთ."</string>
@@ -3447,28 +3612,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-kk/arrays.xml b/res/values-kk/arrays.xml
index 62df25e..d75b606 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Жақсы"</item>
     <item msgid="8986346415847956850">"Өте жақсы"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Әрқашан"</item>
-    <item msgid="844721238536786870">"Жалғанып тұрғанда"</item>
-    <item msgid="1986753720941888596">"Ешқашан"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Үнемі"</item>
-    <item msgid="7433294150916905997">"Жалғанып тұрғанда ғана"</item>
-    <item msgid="1390404486722375028">"Ешқашан"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Соңғы 30 күн"</item>
     <item msgid="6600989128423965319">"Пайдалану циклын орнату…"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 30d6c34..9714fe7 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -23,13 +23,13 @@
     <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="other">Сіз қазір әзірлеуші болудан <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> қадам қашықсыз.</item>
       <item quantity="one">Сіз қазір әзірлеуші болудан <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> қадам қашықсыз.</item>
     </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 +41,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 +107,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">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth параметрлері ашық болғанда маңайдағы құрылғыларға көрінеді."</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>
@@ -121,7 +138,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">"<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>
@@ -157,6 +175,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 картаңызға кіруге рұқсат сұрайды. Ондай рұқсатты берсеңіз, байланыс барысында дерек тасымалы өшіріледі. <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) -->
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Есептік жазбалар"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Орын"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Есептік жазбалар"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Қауіпсіздік және орын"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлау және тіркелу деректері"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон шифрланған"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Құрылғы шифрланған"</string>
@@ -354,40 +378,55 @@
     <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>
@@ -449,6 +488,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 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Бекітпе ашу кескінін өзгерту"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Бекітпесін ашу PIN кодын өзгерту"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Бекітпе кілтсөзін өзгерту"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Әрекетті қайталаңыз. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>-мүмкіндік, барлығы — <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Соңғы мүмкіндік"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Осы жолы жұмыс өрнегін дұрыс енгізбесеңіз, жұмыс профиліңіз және байланысты деректер осы құрылғыдан жойылады."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Осы жолы жұмыс PIN кодын дұрыс енгізбесеңіз, жұмыс профиліңіз және байланысты деректер осы құрылғыдан жойылады."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Осы жолы жұмыс құпия сөзін дұрыс енгізбесеңіз, жұмыс профиліңіз және байланысты деректер осы құрылғыдан жойылады."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Басқа мүмкіндігіңіз жоқ. Жұмыс профиліңіз және байланысты деректер осы құрылғыдан жойылады."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Жабу"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Әрекетті қайталаңыз. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> мүмкіндік, барлығы – <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Деректеріңіз жойылады"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Келесі әрекет кезінде қате өрнек енгізсеңіз, бұл құрылғылардың деректері жойылады"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Келесі әрекет кезінде қате PIN кодын енгізсеңіз, бұл құрылғылардың деректері жойылады"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Келесі әрекет кезінде қате құпия сөз енгізсеңіз, бұл құрылғылардың деректері жойылады"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Келесі әрекет кезінде қате өрнек енгізсеңіз, бұл пайдаланушы жойылады"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Келесі әрекет кезінде қате PIN кодын енгізсеңіз, бұл пайдаланушы жойылады"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Келесі әрекет кезінде қате құпия сөз енгізсеңіз, бұл пайдаланушы жойылады"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Келесі әрекет кезінде қате өрнек енгізсеңіз, жұмыс профиліңіз бен оның деректері жойылады"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Келесі әрекет кезінде қате PIN кодын енгізсеңіз, жұмыс профиліңіз бен оның деректері жойылады"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Келесі әрекет кезінде қате құпия сөз енгізсеңіз, жұмыс профиліңіз бен оның деректері жойылады"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Тым көп қате әрекет жасалды. Бұл құрылғылардың деректері жойылады."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Тым көп қате әрекет жасалды. Бұл пайдаланушы жойылады."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Тым көп қате әрекет жасалды. Бұл жұмыс профилі мен оның деректері жойылады."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Бас тарту"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Кемінде <xliff:g id="COUNT">%d</xliff:g> таңба болуы керек"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN коды кемінде <xliff:g id="COUNT">%d</xliff:g> таңбадан тұруы керек"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Жалғастыру"</string>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +812,6 @@
     <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 (Wi‑Fi-қорғалған) сессиясы анықталды. Бірнеше минуттан кейін қайта әрекеттеніңіз."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi желісі ажыратулы. 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>
@@ -810,7 +874,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 +910,28 @@
     <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>
+    <!-- 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_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">"Хотспот қосылуда…"</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 +978,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>
@@ -980,23 +1063,33 @@
     <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>
+    <!-- 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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1005,7 +1098,7 @@
     <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="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_short" msgid="6140527286137331478">"Екеуі де"</string>
@@ -1014,15 +1107,26 @@
     <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">"Aвтоматтық жарықтық"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ояту үшін көтеру"</string>
-    <string name="doze_title" msgid="2259176504273878294">"Экранды автоматты қосу"</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="title_font_size" msgid="4405544325522105222">"Қаріп өлшемі"</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="6242052161214271091">"SIM картасының құлпы"</string>
@@ -1273,6 +1377,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>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD картасын өшіру"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ішкі USB жадындағы музыка немесе фотолар сияқты барлық деректерді өшіру"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD картадағы музыка және фотосуреттер сияқты барлық деректерді өшіру"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs картасын өшіру"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Телефондағы барлық eSIM карталарындағы деректерді өшіріңіз. Мұның нәтижесінде мобильдік қызмет жоспарынан бас тартылмайды."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Планшеттегі барлық eSIM карталарындағы деректерді өшіріңіз. Мұның нәтижесінде мобильдік қызмет жоспарынан бас тартылмайды."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Планшетті қайта реттеу"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Телефонды қайта реттеу"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Барлық жеке ақпаратыңыз бен жүктелген қолданбаларыңыз өшірілсін бе? Бұл әрекетті кері қайтару мүмкін емес!"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1658,7 @@
     <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="default" msgid="1477351142334784771">"SD картасында"</string>
+    <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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Мәтін енгізуге көмектесетін параметрлер"</string>
@@ -1873,6 +1987,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>
@@ -1899,7 +2017,7 @@
     <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>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Батарея қолдану туралы ақпарат қол жетімсіз"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> қалды"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"Зарядталғанша <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
@@ -1912,7 +2030,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 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"Барлық CPU (орталық өңдеу бірлігі)"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (орталық процессор) алғы шебі"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ұйқы бермеу"</string>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2144,7 +2305,7 @@
     <string name="credentials_enabled" msgid="7588607413349978930">"Растау деректерінің жады қосылды."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Тіркелу деректерінің қорын пайдалану үшін экранды құлыптау PIN кодын немесе құпия сөзін орнату қажет."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Деректерге рұқсаты бар қолданбалар"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Төтенше қоңырау әуені"</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">"Сақтық көшірме жасау және қалпына келтіру"</string>
@@ -2571,7 +2732,7 @@
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Өмірге және мүлікке төнген үлкен қауіптер туралы дабылдар алу"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ауыр қауіптер"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"Өмірге және мүлікке төнген ауыр қауіптер туралы дабылдар алу"</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER хабарламалары"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"САРЫ дабылдар"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Балаларды ұрлап кетулер туралы бюллетеньдерді алу"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Қайталау"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"Қоңыраулар реттегішін қосу"</string>
@@ -2654,17 +2815,20 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"ұялы байланыс, мобильдік, ұялы байланыс операторы, сымсыз, деректер, 4g,3g, 2g, lte"</string>
@@ -2709,6 +2873,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>
@@ -2734,7 +2904,7 @@
     <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>
@@ -2827,14 +2997,12 @@
     <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">"сурет ішіндегі сурет"</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="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
@@ -2942,9 +3110,9 @@
     </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" msgid="7712038508173845101">"Экран қосулы кезде бұғаттау"</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" 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>
@@ -2965,11 +3133,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 +3140,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>
@@ -3071,12 +3234,12 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"Дауыспен енгізу қолданбасын таңдаңыз"</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_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>
@@ -3093,12 +3256,18 @@
     <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="other"><xliff:g id="NUMBER">%2$d</xliff:g> қолданба дұрыс жұмыс істемей тұр</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</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_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>
@@ -3187,8 +3356,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="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>
@@ -3200,8 +3370,6 @@
     <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_switch_title" msgid="3621381992793251070">"Осы көзден рұқсат беру"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Камера үшін екі рет бұру"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Білекті екі рет бұру арқылы камера қолданбасын ашу"</string>
@@ -3296,8 +3464,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 +3484,7 @@
       <item quantity="one">Трафикті үнемдеу функциясы қосулы кезде, 1 қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Трафикті үнемдеу"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Деректерді шексіз пайдалану"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Шектелмейтін деректер"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Фондық дерек өшірілген"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Қосулы"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Өшірулі"</string>
@@ -3382,7 +3549,6 @@
     <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="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>
@@ -3447,28 +3613,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Aвтоматты"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Қолмен"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Орынды қазір босату"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Қимылдар"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Қимыл таңбашалары"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Телефоныңызды басқаруға арналған жылдам қимылдар"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Планшетті басқаруға арналған жылдам қимылдар"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Құрылғыны басқаруға арналған жылдам қимылдар"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Камераға өту"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Камераны жылдам ашу үшін қуат түймесін екі рет басыңыз. Кез келген экраннан жұмыс істейді."</string>
+    <!-- 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>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Хабарландыруларды көру үшін саусақ ізі сканерін пайдалану"</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">"Саусақпен сипап өтіп, хабарландыруларды қараңыз"</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>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-km/arrays.xml b/res/values-km/arrays.xml
index 26ea3dd..dcdd510 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ខ្លាំង"</item>
     <item msgid="8986346415847956850">"ខ្លាំងណាស់"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ជា​និច្ច"</item>
-    <item msgid="844721238536786870">"តែ​ពេល​ដោតប៉ុណ្ណោះ"</item>
-    <item msgid="1986753720941888596">"កុំ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ជា​និច្ច"</item>
-    <item msgid="7433294150916905997">"តែ​ពេល​ដោត"</item>
-    <item msgid="1390404486722375028">"កុំ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 ថ្ងៃ​មុន"</item>
     <item msgid="6600989128423965319">"កំណត់រង្វង់ប្រើប្រាស់..."</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 7e22dc8..6c0c84d 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -23,13 +23,13 @@
     <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="other">ឥឡូវនេះអ្នកនៅសល់ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ជំហានទៀតដើម្បីក្លាយជាអ្នកអភិវឌ្ឍន៍។</item>
       <item quantity="one">ឥឡូវនេះអ្នកនៅសល់ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ជំហានទៀតដើម្បីក្លាយជាអ្នកអភិវឌ្ឍន៍។</item>
     </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 +41,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 +107,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">"អ្នក​មិន​មាន​សិទ្ធិ​ ដើម្បី​​ប្ដូរ​ការ​កំណត់​ប៊្លូធូស​ទេ។"</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> អាចមើលឃើញដោយឧបករណ៍នៅក្បែរនោះ នៅពេលដែលបើកការកំណត់ប្ល៊ូធូស។"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- 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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ប្ដូរ​លំនាំ​ដោះ​សោ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ប្ដូរ​កូដ​ PIN ដោះ​សោ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ប្ដូរ​ពាក្យសម្ងាត់​ដោះ​សោ"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ព្យាយាមម្តងទៀត ការព្យាយាម <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ដងនៃ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ដង"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ការព្យាយាមចុងក្រោយ"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ប្រសិនបើអ្នកបញ្ចូលលំនាំការងារមិនបានត្រឹមត្រូវសម្រាប់ការព្យាយាមលើកនេះទេ នោះប្រវត្តិរូបការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធនឹងត្រូវបានយកចេញពីឧបករណ៍នេះ។"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ប្រសិនបើអ្នកបញ្ចូលកូដ PIN ការងារមិនបានត្រឹមត្រូវសម្រាប់ការព្យាយាមលើកនេះទេ នោះប្រវត្តិរូបការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធនឹងត្រូវបានយកចេញពីឧបករណ៍នេះ។"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ប្រសិនបើអ្នកបញ្ចូលពាក្យសម្ងាត់ការងារមិនបានត្រឹមត្រូវសម្រាប់ការព្យាយាមលើកនេះទេ នោះប្រវត្តិរូបការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធនឹងត្រូវបានយកចេញពីឧបករណ៍នេះ។"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"មានការព្យាយាមមិនត្រឹមត្រូវច្រើនដងពេកហើយ។ ប្រវត្តិរូបការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធនឹងត្រូវបានយកចេញពីឧបករណ៍នេះ។"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"បដិសេធ"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"សូម​ព្យាយាមម្តងទៀត។ ការព្យាយាម <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ដងនៃ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ដង។"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ទិន្នន័យរបស់អ្នកនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ប្រសិនបើអ្នកបញ្ចូលលំនាំមិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ ទិន្នន័យឧបករណ៍នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ប្រសិនបើអ្នកបញ្ចូលកូដ PIN មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ ទិន្នន័យឧបករណ៍នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ប្រសិនបើអ្នកបញ្ចូលពាក្យសម្ងាត់មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ ទិន្នន័យឧបករណ៍នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ប្រសិនបើអ្នកបញ្ចូលលំនាំមិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ប្រសិនបើអ្នកបញ្ចូលកូដ PIN មិនត្រឹមត្រូវ​នៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ប្រសិនបើអ្នកបញ្ចូលពាក្យសម្ងាត់មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ប្រសិនបើអ្នកបញ្ចូលលំនាំមិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ កម្រងព័ត៌មានការងាររបស់អ្នក និងទិន្នន័យរបស់វានឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ប្រសិនបើអ្នកបញ្ចូលកូដ PIN មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ កម្រងព័ត៌មានការងាររបស់អ្នក និងទិន្នន័យរបស់វានឹងត្រូវបានលុប"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ប្រសិនបើអ្នកបញ្ចូលពាក្យសម្ងាត់មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ កម្រងព័ត៌មានការងាររបស់អ្នក និងទិន្នន័យរបស់វានឹងត្រូវបានលុប"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក ទិន្នន័យឧបករណ៍នេះនឹងត្រូវបានលុប។"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប។"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក កម្រងព័ត៌មានការងារនេះ និងទិន្នន័យរបស់វានឹងត្រូវបានលុប។"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"បដិសេធ"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ត្រូវ​​មាន​យ៉ាង​ហោច​ណាស់ <xliff:g id="COUNT">%d</xliff:g> តួ"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"កូដ PIN ​ត្រូវ​មាន​លេខ​យ៉ាង​ហោច​ណាស់ <xliff:g id="COUNT">%d</xliff:g> ខ្ទង់"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"បន្ត"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"ឈ្មោះ​បណ្ដាញ"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"បញ្ចូល SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"សុវត្ថិភាព"</string>
@@ -810,7 +873,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>
@@ -847,9 +909,28 @@
     <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>
+    <!-- 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_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">"កំពុង​បើក​ហតស្ពត..."</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1007,7 +1099,7 @@
     <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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"កំណត់​ការ​ចាក់សោ​ស៊ីម​កាត"</string>
@@ -1080,7 +1183,7 @@
     <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_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">"ផ្ដាច់​​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី មើល​ទំហំ​ដែល​មាន"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"លុប​កាត​​អេសឌី"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​ខាង​ក្នុង ដូច​ជា​តន្ត្រី ឬ​​រូបថត"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​កាត​អេសឌី ដូច​ជា​តន្ត្រី ឬ​រូបថត"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"លុប eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"លុប eSIM ទាំងអស់នៅលើទូរសព្ទនេះ។ វានឹងមិនលុបគម្រោងសេវាកម្មទិន្នន័យចល័តរបស់អ្នកទេ។"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"លុប eSIM ទាំងអស់នៅលើថេប្លេតនេះ។ វានឹងមិនលុបគម្រោងសេវាកម្មទិន្នន័យចល័តរបស់អ្នកទេ។"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"កំណត់​កុំព្យូទ័រ​បន្ទះ​ឡើងវិញ"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"កំណត់​ទូរស័ព្ទ​ឡើងវិញ"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"លុបព័ត៌មានផ្ទាល់ខ្លួន និងកម្មវិធីដែលបានទាញយករបស់អ្នកទាំងអស់? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,16 +1592,22 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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="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>
-    <string name="permissions_label" msgid="2605296874922726203">"ការអនុញ្ញាត"</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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"កំពុង​ដំណើរការ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ឧបករណ៍​ផ្ទុក​​យូអេសប៊ី"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"លើ​កាត​អេសឌី"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ជំនួយ​ក្នុងការ​បញ្ចូល"</string>
@@ -1873,6 +1986,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>
@@ -1899,7 +2016,7 @@
     <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>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"មិន​មាន​ទិន្នន័យ​ការ​ប្រើ​ថ្ម"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"នៅ​សល់ <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ដើម្បី​បញ្ចូល​ថ្ម"</string>
@@ -1933,12 +2050,52 @@
     <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>
+    <!-- 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>
@@ -1947,13 +2104,14 @@
     <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="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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU សរុប"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ផ្ទៃ​ខាង​មុខ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"មិន​ដេក"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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>
@@ -2654,17 +2814,20 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"ចល័ត ឧបករណ៍​ចល័ត ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ ឥត​ខ្សែ ទិន្នន័យ 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,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">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ប៉ះ​ស្លាក​ដើម្បី​សរសេរ..."</string>
@@ -2723,7 +2892,7 @@
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"បានកំណត់សំឡេងរោទិ៍ឲ្យស្ងាត់"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"កម្រិតសំឡេងរោទិ៍ត្រឹម 80%"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"កម្រិត​សំឡេង​មេឌៀ"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"កម្រិត​សំឡេងម៉ោង​រោទ៍"</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>
@@ -2757,7 +2926,7 @@
     <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_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>
@@ -2827,14 +2996,12 @@
     <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_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_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="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_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>
@@ -2861,8 +3028,8 @@
     <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>
@@ -2904,8 +3071,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>
@@ -2917,7 +3084,7 @@
     <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" 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>
@@ -2965,11 +3132,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 +3139,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 +3257,12 @@
     <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>
+    <!-- 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>
@@ -3187,8 +3355,9 @@
     <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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"អនុញ្ញាត​កម្មវិធី​ពី​ប្រភពនេះ"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"បង្វិលពីរដងដើម្បីប្រើកាមេរ៉ា"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"បើកកម្មវិធីកាមេរ៉ាដោយបង្វិលកដៃរបស់អ្នកពីរដង"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">អនុញ្ញាតឲ្យកម្មវិធី 1 ប្រើទិន្នន័យគ្មានកំណត់ នៅពេលកម្មវិធីសន្សំសំចៃទិន្នន័យបានបើក</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"កម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ការប្រើទិន្នន័យដែលគ្មានការកំហិត"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"ទិន្នន័យ​ដែល​លែង​មាន​ការដាក់​កំហិត"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ទិន្នន័យផ្ទៃខាងក្រោយបានបិទ"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"បើក"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"បិទ"</string>
@@ -3382,7 +3548,6 @@
     <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_warning" msgid="9086859595338944882">"សេវាកម្ម SMS ពិសេសអាចនឹងគិតថ្លៃ ហើយបន្ថែមតម្លៃនោះទៅក្នុងវិក្កយបត្រក្រុមហ៊ុនផ្តល់សេវាទូរស័ព្ទរបស់អ្នក។ ប្រសិនបើដំណើរការសិទ្ធិអនុញ្ញាតសម្រាប់កម្មវិធីណាមួយ នោះអ្នកនឹងអាចផ្ញើសេវាកម្ម SMS ពិសេសដោយប្រើកម្មវិធីនោះ។"</string>
@@ -3447,28 +3612,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-kn/arrays.xml b/res/values-kn/arrays.xml
index bcd6f00..9b5a56c 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ಉತ್ತಮ"</item>
     <item msgid="8986346415847956850">"ಉತ್ಕೃಷ್ಟ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ಯಾವಾಗಲೂ"</item>
-    <item msgid="844721238536786870">"ಕೇವಲ ಪ್ಲಗ್ ಇನ್ ಮಾಡಿದಾಗ"</item>
-    <item msgid="1986753720941888596">"ಎಂದಿಗೂ ಬೇಡ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ಯಾವಾಗಲೂ"</item>
-    <item msgid="7433294150916905997">"ಕೇವಲ ಪ್ಲಗ್ ಇನ್ ಮಾಡಿದಾಗ"</item>
-    <item msgid="1390404486722375028">"ಎಂದಿಗೂ ಇಲ್ಲ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"ಕಳೆದ 30 ದಿನಗಳು"</item>
     <item msgid="6600989128423965319">"ಬಳಕೆಯ ಆವರ್ತನೆಯನ್ನು ಹೊಂದಿಸಿ..."</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 71d09ed..5829263 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -23,13 +23,13 @@
     <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="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="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 +41,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 +107,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">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ನೀವು ಅನುಮತಿ ಹೊಂದಿಲ್ಲ."</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> ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- 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">"ದಿನಾಂಕ &amp; ಸಮಯ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ಸಮಯದ ವಲಯವನ್ನು ಆರಿಸಿ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -282,7 +305,7 @@
     <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_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>
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ಖಾತೆಗಳು"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ಸ್ಥಳ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ಖಾತೆಗಳು"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"ಭದ್ರತೆ ಮತ್ತು ಸ್ಥಳ"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಮತ್ತು ರುಜುವಾತುಗಳು"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ಸಾಧನ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಆಗಿದೆ"</string>
@@ -354,40 +378,55 @@
     <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>
+    <!-- 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>
@@ -449,6 +488,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 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ಅನ್‌ಲಾಕ್ ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ಅನ್‌ಲಾಕ್ ಪಾಸ್‌ವರ್ಡ್‌ ಬದಲಾಯಿಸಿ"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ನಲ್ಲಿ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ಪ್ರಯತ್ನ."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ಕೊನೆಯ ಪ್ರಯತ್ನ"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ನೀವು ಈ ಪ್ರಯತ್ನದಲ್ಲಿ ಕೆಲಸದ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ನೀವು ಈ ಪ್ರಯತ್ನದಲ್ಲಿ ಕೆಲಸದ ಪಿನ್‌ ಅನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ನೀವು ಈ ಪ್ರಯತ್ನದಲ್ಲಿ ಕೆಲಸದ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ಹಲವಾರು ತಪ್ಪಾದ ಪ್ರಯತ್ನಗಳು. ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ವಜಾಗೊಳಿಸಿ"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ನಲ್ಲಿ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ಪ್ರಯತ್ನ."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪ್ಯಾಟರ್ನ್‌ ನಮೂದಿಸಿದರೆ, ಈ ಸಾಧನಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಿನ್ ನಮೂದಿಸಿದರೆ, ಈ ಸಾಧನಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿದರೆ, ಈ ಸಾಧನಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪ್ಯಾಟರ್ನ್‌ ನಮೂದಿಸಿದರೆ, ಈ ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಿನ್ ನಮೂದಿಸಿದರೆ, ಈ ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿದರೆ, ಈ ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪ್ಯಾಟರ್ನ್‌ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಿನ್ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ಹಲವಾರು ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. ಈ ಸಾಧನಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ಹಲವಾರು ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. ಈ ಬಳಕೆದಾರಾರನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ಹಲವಾರು ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. ಈ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಅದರ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ವಜಾಗೊಳಿಸಿ"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ಕನಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಕ್ಯಾರೆಕ್ಟರ್‌ಗಳನ್ನು ಹೊಂದಿರಬೇಕು"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ಪಿನ್ ಕನಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ಮುಂದುವರಿಸು"</string>
@@ -618,7 +667,7 @@
     <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>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"ಜೋಡಿಸು ಮತ್ತು ಸಂಪರ್ಕಪಡಿಸು"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"ಜೋಡಿಸು &amp; ಸಂಪರ್ಕಪಡಿಸು"</string>
     <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>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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>
@@ -635,7 +700,7 @@
     <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>
@@ -722,7 +787,7 @@
     <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>
+    <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>
@@ -747,7 +812,6 @@
     <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">"ವೈ-ಫೈ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ. ಹಾಗಾಗಿ, 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>
@@ -810,7 +874,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>
@@ -847,9 +910,28 @@
     <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>
+    <!-- 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_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">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</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 +978,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>
@@ -912,7 +995,7 @@
     <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="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>
@@ -980,23 +1063,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1113,19 @@
     <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>
+    <!-- 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">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1273,6 +1377,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ಖಾಲಿ ಇರುವಂತಿಲ್ಲ."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ಕ್ಷೇತ್ರವು 3 ಅಂಕಿಗಳಾಗಿರಬೇಕು."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ಕ್ಷೇತ್ರವು 2 ಅಥವಾ 3 ಅಂಕಿಗಳಾಗಿರಬೇಕು."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"%s ಪ್ರಕಾರದ APN ಗಳನ್ನು ಸೇರಿಸಲು ವಾಹಕ ಅನುಮತಿಸುವುದಿಲ್ಲ."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ಡಿಫಾಲ್ಟ್ APN ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ."</string>
     <string name="menu_restore" msgid="8260067415075573273">"ಡೀಫಾಲ್ಟ್‌ಗೆ  ಮರುಹೊಂದಿಸು"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ಡಿಫಾಲ್ಟ್ APN ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಿಕೆಯು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD ಕಾರ್ಡ್‌ ಅಳಿಸಿ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ಆಂತರಿಕ USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ ಸಂಗೀತ ಅಥವಾ ಫೋಟೋಗಳಂಥ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ಸಂಗೀತ ಫೋಟೋಗಳನ್ನು ಒಳಗೊಂಡಂತೆ SD ಕಾರ್ಡ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMಗಳನ್ನು ಅಳಿಸಿಹಾಕಿ"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ಫೋನ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ eSIMಗಳನ್ನು ಅಳಿಸಿಹಾಕಿ. ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ಟ್ಯಾಬ್ಲೆಟ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ eSIMಗಳನ್ನು ಅಳಿಸಿಹಾಕಿ. ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಮರುಹೊಂದಿಸು"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ಫೋನ್‌ ಮರುಹೊಂದಿಸು"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"ನಿಮ್ಮ ಎಲ್ಲ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಳಿಸಬೇಕೇ? ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1359,7 +1461,7 @@
     <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>
+    <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_mode_title" msgid="3982009713118421689">"ಮೋಡ್"</string>
@@ -1376,7 +1478,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>
@@ -1453,7 +1555,7 @@
     <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_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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1658,7 @@
     <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="default" msgid="1477351142334784771">"SD ಕಾರ್ಡ್‌ ನಲ್ಲಿ"</string>
+    <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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ಇನ್‌ಪುಟ್ ಸಹಾಯ"</string>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"CPU ಮೊತ್ತ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ಮುನ್ನೆಲೆ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ಎಚ್ಚರವಾಗಿಡಿ"</string>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2186,7 +2347,7 @@
     <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">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಿ"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ"</string>
     <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ನೆಟ್‌ವರ್ಕ್‌ವೊಂದನ್ನು ಸೇರಿಸಿ"</string>
@@ -2397,7 +2558,7 @@
     <string name="vpn_replace" msgid="5442836256121957861">"ಸ್ಥಾನಾಂತರಿಸು"</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_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>
@@ -2654,16 +2815,19 @@
       <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>
     <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">"ವೈಫೈ, ವೈ-ಫೈ, ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕ"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ಪಠ್ಯ ಸಂದೇಶ, ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ, ಸಂದೇಶಗಳು, ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</string>
@@ -2709,6 +2873,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">"ವೈ-ಫೈ NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ಬರೆಯಲು ಟ್ಯಾಗ್‌ ಅನ್ನು ಟ್ಯಾಪ್‌ ಮಾಡಿ..."</string>
@@ -2833,8 +3003,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>
@@ -2965,11 +3133,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 +3140,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ಈ ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ಹೆಚ್ಚಿನ ಸಂರಕ್ಷಣೆ ನೀಡಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭವಾಗುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳು ಸೇರಿದಂತೆ ಕರೆಗಳನ್ನು, ಸಂದೇಶಗಳನ್ನು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ಸಹಾಯ ಮಾಡುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು, ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದು ಮಾತ್ರವಲ್ಲದೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ, ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದು ಮಾತ್ರವಲ್ಲದೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನವು ಪ್ರಾರಂಭವಾಗುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳು ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವಾಗ, ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸಿ&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ಹೌದು"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"ಇಲ್ಲ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN ಅಗತ್ಯವಿದೆಯೇ?"</string>
@@ -3095,6 +3258,12 @@
     <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>
+    <!-- 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>
@@ -3187,8 +3356,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="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>
@@ -3200,8 +3370,6 @@
     <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_switch_title" msgid="3621381992793251070">"ಈ ಮೂಲದಿಂದ ಅನುಮತಿಸಿ"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"ಕ್ಯಾಮರಾಗೆ ಎರಡು ಬಾರಿ ತಿರುಗಿಸಿ"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"ನಿಮ್ಮ ಮಣಿಕಟ್ಟನ್ನು ಎರಡು ಬಾರಿ ತಿರುಗಿಸುವ ಮೂಲಕ ಕ್ಯಾಮರಾ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಿರಿ"</string>
@@ -3296,8 +3464,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 +3484,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>
@@ -3382,7 +3549,6 @@
     <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_warning" msgid="9086859595338944882">"ಪ್ರೀಮಿಯಂ SMS ನಿಮ್ಮ ವೆಚ್ಚಗಳಿಗೆ ಕಾರಣವಾಗಬಹುದು ಮತ್ತು ಇದನ್ನು ನಿಮ್ಮ ವಾಹಕ ಬಿಲ್‌ಗಳಿಗೆ ಸೇರಿಸಲಾಗುತ್ತದೆ. ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಯನ್ನು ಸಕ್ರೀಯಗೊಳಿಸಿದರೆ, ನೀವು ಆ ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸಿಕೊಂಡು ಪ್ರೀಮಿಯಂ SMS ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
@@ -3447,28 +3613,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3476,7 +3669,7 @@
     <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_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="4051513950976670853">"ತತ್‌ಕ್ಷಣ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-ko/arrays.xml b/res/values-ko/arrays.xml
index fcf8801..f59cdf7 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"좋음"</item>
     <item msgid="8986346415847956850">"우수함"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"항상"</item>
-    <item msgid="844721238536786870">"충전 중인 경우에만"</item>
-    <item msgid="1986753720941888596">"안함"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"항상"</item>
-    <item msgid="7433294150916905997">"충전 중인 경우에만"</item>
-    <item msgid="1390404486722375028">"안함"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"최근 30일"</item>
     <item msgid="6600989128423965319">"사용 주기 설정..."</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d8594f7..8367940 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -23,13 +23,13 @@
     <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="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g>단계만 더 완료하면 개발자가 될 수 있습니다.</item>
       <item quantity="one"><xliff:g id="STEP_COUNT_0">%1$d</xliff:g>단계만 더 완료하면 개발자가 될 수 있습니다.</item>
     </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 +41,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 +107,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;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 연결이 끊어집니다.&lt;br&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">"블루투스 설정을 변경할 권한이 없습니다."</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>이(가) 주변의 기기에 표시됩니다."</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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) -->
@@ -285,7 +308,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 +352,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 +377,55 @@
     <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">"지문으로 휴대전화를 잠금 해제하도록 설정했습니다. 지금 건너뛰면 나중에 설정해야 하며 설정에는 약 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>
+    <!-- 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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"잠금해제 패턴 변경"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"잠금해제 PIN 변경"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"잠금해제 비밀번호 변경"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"다시 시도하세요. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>회 중 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>번째 시도입니다."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"마지막 시도"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"이번 시도에서 잘못된 직장 패턴을 입력하는 경우 직장 프로필과 관련 데이터가 이 기기에서 삭제됩니다."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"이번 시도에서 잘못된 직장 PIN을 입력하는 경우 직장 프로필과 관련 데이터가 이 기기에서 삭제됩니다."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"이번 시도에서 잘못된 직장 비밀번호를 입력하는 경우 직장 프로필과 관련 데이터가 이 기기에서 삭제됩니다."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"잘못된 시도 횟수가 너무 많습니다. 직장 프로필과 관련 데이터가 이 기기에서 삭제됩니다."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"닫기"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"다시 시도하세요. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>회 중 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>번째 시도입니다."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"데이터가 삭제됨"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"다음번 시도에서 잘못된 패턴을 입력하면 이 기기의 데이터가 삭제됩니다."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"다음번 시도에서 잘못된 PIN을 입력하면 이 기기의 데이터가 삭제됩니다."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"다음번 시도에서 잘못된 비밀번호를 입력하면 이 기기의 데이터가 삭제됩니다."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"다음번 시도에서 잘못된 패턴을 입력하면 이 사용자가 삭제됩니다."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"다음번 시도에서 잘못된 PIN을 입력하면 이 사용자가 삭제됩니다."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"다음번 시도에서 잘못된 비밀번호를 입력하면 이 사용자가 삭제됩니다."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"다음번 시도에서 잘못된 패턴을 입력하면 직장 프로필 및 관련 데이터가 삭제됩니다."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"다음번 시도에서 잘못된 PIN을 입력하면 직장 프로필 및 관련 데이터가 삭제됩니다."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"다음번 시도에서 잘못된 비밀번호를 입력하면 직장 프로필 및 관련 데이터가 삭제됩니다."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"잘못된 시도 횟수가 너무 많습니다. 이 기기의 데이터는 삭제됩니다."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"잘못된 시도 횟수가 너무 많습니다. 이 사용자는 삭제됩니다."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"잘못된 시도 횟수가 너무 많습니다. 이 직장 프로필 및 관련 데이터는 삭제됩니다."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"닫기"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"<xliff:g id="COUNT">%d</xliff:g>자 이상이어야 합니다."</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN은 <xliff:g id="COUNT">%d</xliff:g>자 이상이어야 합니다."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"계속"</string>
@@ -597,7 +645,7 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;와(과) 페어링하려면&lt;br&gt;&lt;br&gt;이 패스키(&lt;b&gt;<xliff:g id="PASSKEY">%2$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_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>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"네트워크 이름"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID 입력"</string>
     <string name="wifi_security" msgid="6603611185592956936">"보안"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"핫스팟 켜는 중…"</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1016,12 +1108,23 @@
     <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>
+    <!-- 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>
@@ -1080,8 +1183,8 @@
     <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" 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>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN을 비워둘 수 없습니다."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC는 3자리 숫자여야 합니다."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC는 2~3자리 숫자여야 합니다."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"이동통신사에서 %s 유형의 APN을 추가하도록 허용하지 않습니다."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"기본 APN 설정 복원 중"</string>
     <string name="menu_restore" msgid="8260067415075573273">"초기화"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"기본 APN 설정을 초기화했습니다."</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD 카드 지우기"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"내부 USB 저장소에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD 카드에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"e-SIM 삭제"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"휴대전화에서 모든 eSIM을 삭제합니다. 삭제하더라도 휴대기기 서비스 요금제를 계속 사용할 수 있습니다."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"태블릿에서 모든 eSIM을 삭제합니다. 삭제하더라도 휴대기기 서비스 요금제를 계속 사용할 수 있습니다."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"태블릿 초기화"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"휴대전화 초기화"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"모든 개인정보와 다운로드한 앱을 삭제하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SD 카드"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"입력 지원"</string>
@@ -1765,7 +1878,7 @@
     <string name="experimental_category_title" msgid="5272318666666893547">"실험"</string>
     <string name="talkback_title" msgid="7912059827205988080">"음성 안내 지원"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"주로 시각 장애가 있는 사용자를 위한 스크린 리더"</string>
-    <string name="select_to_speak_summary" msgid="4282846695497544515">"화면에서 항목을 탭하여 읽는 소리 듣기"</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_gestures_title" msgid="3719929521571489913">"세 번 탭하여 확대"</string>
@@ -1873,6 +1986,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>
@@ -1933,12 +2050,52 @@
     <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="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>
+    <!-- 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>
@@ -1953,7 +2110,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">"총 CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"켜진 상태로 유지"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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="APP">%2$s</xliff:g>에서 <xliff:g id="PERCENT">%1$s</xliff:g> 사용"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"전체 배터리 사용량의 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2567,8 +2727,8 @@
     <string name="support_summary" msgid="8276116616493882830">"도움말, 전화 및 채팅 지원"</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>
+    <string name="extreme_threats_title" msgid="6549541803542968699">"극단적 위협"</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">"황색 경고"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <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">"SMS, 문자 메시지, 텍스트 메시지, 메시지"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"셀룰러, 모바일, 이동통신사, 무선, 데이터, 4G, 3G, 2G, LTE"</string>
@@ -2709,6 +2872,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>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다. \n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"지문을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 PIN을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 PIN을 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"지문을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 패턴을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 패턴을 입력하도록 설정하시겠습니까?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"지문을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"지문을 사용하여 기기를 잠금 해제하는 방법에 더해 기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지, 알림(예: 알람)을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"예"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"아니요"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN이 필요한가요?"</string>
@@ -3094,7 +3256,13 @@
     <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="hide_extra_apps" msgid="5016497281322459633">"앱 사용량 표시"</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>
+    <!-- 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>
@@ -3187,8 +3355,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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"이 소스에서 가져온 앱 설치 허용"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"손목을 두 번 돌려 카메라 열기"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"손목을 두 번 돌리면 카메라 앱이 열립니다."</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">데이터 절약 모드가 켜져 있을 때 1개의 앱이 무제한 데이터를 사용할 수 있도록 허용됨</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"데이터 절약 모드"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"무제한 데이터 액세스"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"무제한 데이터"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"백그라운드 데이터 사용 중지됨"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"사용"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"사용 안함"</string>
@@ -3382,7 +3548,6 @@
     <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_warning" msgid="9086859595338944882">"프리미엄 SMS는 요금이 부과될 수 있으며 이는 이동통신사 요금에 추가됩니다. 앱에 권한을 부여하면 해당 앱을 사용하여 프리미엄 SMS를 사용할 수 있게 됩니다."</string>
@@ -3447,28 +3612,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-ky/arrays.xml b/res/values-ky/arrays.xml
index f711e95..ac99cad 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Жакшы"</item>
     <item msgid="8986346415847956850">"Эң жакшы"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Дайыма"</item>
-    <item msgid="844721238536786870">"Дүрмөттөө учурунда гана"</item>
-    <item msgid="1986753720941888596">"Эч качан"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Дайыма"</item>
-    <item msgid="7433294150916905997">"Бир гана дүрмөттөө учурунда"</item>
-    <item msgid="1390404486722375028">"Эч качан"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Акыркы 30 күн"</item>
     <item msgid="6600989128423965319">"Колдонуу мерчимин коюу…"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index e38f333..bb2dad7 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -23,13 +23,13 @@
     <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="other">Сиздин иштеп чыгуучу болушуңузга <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кадам калды.</item>
       <item quantity="one">Сиздин иштеп чыгуучу болушуңузга <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> кадам калды.</item>
     </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 +41,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 +106,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>
@@ -120,7 +137,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">"<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>
@@ -156,6 +174,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 картаны пайдалануу укугу берилсе, түзмөк SIM картага туташып жатканда дайындарды мобилдик тармак аркылуу өткөрүү кызматтары убактылуу иштебей калат. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> түзмөгүнө SIM картаны пайдалануу мүмкүнчүлүгүн берүү"</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) -->
@@ -328,7 +351,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Каттоо эсептери"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Жайгашкан жер"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Каттоо эсептери"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Коопсуздук жана жайгашкан жер"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлөө жана эсептик дайындар"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон шифрленген"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Түзмөк шифрленген"</string>
@@ -353,40 +377,55 @@
     <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>
@@ -448,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Кулпн ачуу үлгсн өзгрт"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Клпн ачуу PIN кдн өзгр"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Кулпн ачуу срсзн өзгрт"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Кайра аракет кылыңыз. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ичинен <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> аракет калды."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Акыркы аракет"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Эгер ушул жолу жумуштун графикалык ачкычын туура эмес киргизсеңиз, жумуш профилиңиз менен ага байланыштуу дайындар бул түзмөктөн алынып салынат."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Эгер ушул жолу жумуштун PIN кодун туура эмес киргизсеңиз, жумуш профилиңиз менен ага байланыштуу дайындар бул түзмөктөн алынып салынат."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Эгер сырсөздү ушул жолу туура эмес киргизсеңиз, жумуш профилиңиз менен ага байланыштуу дайындар бул түзмөктөн алынып салынат."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Өтө көп жолу туура эмес аракет кылынды. Жумуш профилиңиз менен ага байланыштуу дайындар бул түзмөктөн алынып салынат."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Этибарга албоо"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Кайра аракет кылыңыз. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> аракеттен <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> аракет калды."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Дайындарыңыз жок кылынат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Эгер графикалык кийинки жолу туура эмес киргизсеңиз, бул колдонуучу жок кылынат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул колдонуучу жок кылынат"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул колдонуучу жок кылынат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары жок кылынат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары жок кылынат"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, жумуш профилиңиз жана анын дайындары жок кылынат"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Өтө көп жолу туура эмес аракет кылынды. Бул түзмөктүн дайындары жок кылынат."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Өтө көп жолу туура эмес аракет кылынды. Бул колдонуучу жок кылынат."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Өтө көп жолу туура эмес аракет кылынды. Бул жумуш профили жана анын дайындары жок кылынат."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Этибарга албоо"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Кеминде <xliff:g id="COUNT">%d</xliff:g> белгиден турушу керек"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN код кеминде <xliff:g id="COUNT">%d</xliff:g> орундуу сандан турушу керек"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Улантуу"</string>
@@ -625,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -746,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"Тармактын аталышы"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID киргизиңиз"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Коопсуздук"</string>
@@ -809,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"Хотспот жандырылууда…"</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,13 +977,14 @@
     <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>
     <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="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>
@@ -979,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1019,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1272,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN бош болбошу керек."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC талаасы 3 орундуу болууга тийиш."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC талаасы 2 же 3 орундуу болууга тийиш."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Байланыш оператору %s түрүндөгү APN\'дерди кошууга уруксат бербейт."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Абалкы APN тууралоолорун кайтарууда."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Баштапкы абалга келтирүү"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Абалкы APN тууралоолорун кайтаруу аяктады."</string>
@@ -1301,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD картаны тазалоо"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ички USB сактагычтагы музыка же сүрөттөр сыяктуу бардык берилиштерди тазалоо"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD-картадагы музыка же сүрөттөр сыяктуу бардык берилиштерди тазалоо"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM-карталарын тазалоо"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Телефондогу бардык eSIM-карталар тазалансын. Муну менен мобилдик кызматыңыз өчүрүлбөйт."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Планшеттеги бардык eSIM-карталар тазалансын. Муну менен мобилдик кызматыңыз өчүрүлбөйт."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Планшетти баштапкы абалга келтирүү"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Телефонду баштапкы абалга келтирүү"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Сиздин бардык жеке маалыматтарыңыз жана жүктөп алынган колдонмолоруңуз өчүрүлсүнбү? Сиз бул аракетти кайра кайтара албайсыз!"</string>
@@ -1323,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1490,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1549,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SD картада"</string>
+    <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>
@@ -1658,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Текст киргизүүгө жардам"</string>
@@ -1753,7 +1867,7 @@
     <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="screen_reader_category_title" msgid="7739154903913400641">"Экрандагыны окугучтар"</string>
@@ -1872,6 +1986,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>
@@ -1898,7 +2016,7 @@
     <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>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Батарей колдонуу берилиштери жок."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> калды"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> кубаттоо"</string>
@@ -1911,7 +2029,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>
@@ -1938,6 +2056,46 @@
     <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>
@@ -1952,7 +2110,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">"Жалпы CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Алдыңкы фондогу CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ойгоо кармоо"</string>
@@ -2004,6 +2163,8 @@
     <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>
+    <!-- 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="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>
@@ -2657,17 +2818,20 @@
       <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>
     <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">"SMS билдирүү, SMS жазышуу, билдирүүлөр, билдирүү жазышуу"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"уюлдук, мобилдик түзмөк, байланыш оператору, зымсыз, дайындар, 4g, 3g, 2g, lte"</string>
@@ -2712,6 +2876,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,9 +2895,9 @@
     <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="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="notification_ringtone_title" msgid="4468722874617061231">"Эскертменин демейки үнү"</string>
@@ -2810,7 +2980,7 @@
     <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="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">
@@ -2836,8 +3006,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>
@@ -2865,7 +3033,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>
@@ -2968,11 +3136,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 +3143,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 +3261,12 @@
     <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>
+    <!-- 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>
@@ -3190,8 +3359,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="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>
@@ -3203,8 +3373,6 @@
     <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_switch_title" msgid="3621381992793251070">"Бул булактан алынган колдонмолорго ишеним көрсөтүү"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Колду эки айлантып камераны ачуу"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Колуңузду эки айлантып, камера колдонмосун ачыңыз"</string>
@@ -3299,8 +3467,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 +3487,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,7 +3552,6 @@
     <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_warning" msgid="9086859595338944882">"Артыкчылыктуу SMS үчүн сизден акы алынып, ал операторуңуздун эсептерине кошулушу мүмкүн. Эгер кайсы бир колдонмого уруксат берсеңиз, ошол колдонмо аркылуу артыкчылыктуу SMS жөнөтө аласыз."</string>
@@ -3450,28 +3616,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3575,6 +3768,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 +3782,10 @@
     <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>
+    <!-- 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-lo/arrays.xml b/res/values-lo/arrays.xml
index ccb296c..fbc8104 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ດີ"</item>
     <item msgid="8986346415847956850">"ດີເລີດ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ຕະຫຼອດເວລາ"</item>
-    <item msgid="844721238536786870">"ສະເພາະເມື່ອສຽບສາຍສາກ"</item>
-    <item msgid="1986753720941888596">"ບໍ່ໃຊ້"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ຕະຫຼອດເວລາ"</item>
-    <item msgid="7433294150916905997">"ສະເພາະເມື່ອສຽບສາຍສາກເທົ່ານັ້ນ"</item>
-    <item msgid="1390404486722375028">"ບໍ່ໃຊ້"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 ມື້ທີ່ຜ່ານມາ"</item>
     <item msgid="6600989128423965319">"ຕັ້ງ​ຮອບ​ການ​ນຳ​ໃຊ້..."</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index ef2befe..61dae63 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -23,13 +23,13 @@
     <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="other">ປະຈຸບັນທ່ານຍັງຢູ່ຫ່າງ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ຂັ້ນຕອນຈາກການເປັນຜູ້ພັດທະນາ.</item>
       <item quantity="one">ປະຈຸບັນທ່ານຍັງຢູ່ຫ່າງ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ຂັ້ນຕອນຈາກການເປັນຜູ້ພັດທະນາ.</item>
     </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 +41,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 +107,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">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ສາ​ມາດ​ໃຫ້​ອຸ​ປະ​ກອນ​ໃກ້​ຄຽງ​ເຫັນ​ໄດ້ ໃນ​ຂະ​ນະ​ທີ່ການ​ຕັ້ງ​ຄ່າ Bluetooth ເປີດ."</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>
@@ -121,7 +138,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">"ແຕະເພື່ອຈັບຄູ່ກັບ <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>
@@ -157,6 +175,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">"ວັນ​ທີ &amp; ເວ​ລາ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"ເລືອກເຂດເວລາ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"ປ່ຽນຮູບແບບການປົດລັອກ"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ປ່ຽນລະຫັດປົດລັອກ PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ປ່ຽນລະຫັດປົດລັອກ"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ລອງໃໝ່ອີກຄັ້ງ. ຄວາມພະຍາຍາມເທື່ອທີ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ຄວາມພະຍາຍາມເທື່ອສຸດທ້າຍ"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ຫາກທ່ານລະບຸຮູບແບບລະຫັດບ່ອນເຮັດວຽກບໍ່ຖືກຕ້ອງໃນເທື່ອນີ້, ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ຫາກທ່ານໃສ່ລະຫັດ PIN ບ່ອນເຮັດວຽກບໍ່ຖືກຕ້ອງໃນເທື່ອນີ້, ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ຫາກທ່ານໃສ່ລະຫັດຜ່ານບ່ອນເຮັດວຽກບໍ່ຖືກຕ້ອງໃນເທື່ອນີ້, ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ພະຍາຍາມບໍ່ສຳເລັດຫຼາຍເທື່ອເກີນໄປ. ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງໄວ້ຂອງທ່ານຈະຖືກລຶບອອກຈາກອຸປະກອນນີ້."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ປິດໄວ້"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ກະລຸນາລອງໃໝ່ອີກຄັ້ງ. ຄວາມພະຍາຍາມເທື່ອທີ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ຂໍ້ມູນຂອງທ່ານຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ຫາກທ່ານໃສ່ຣູບແບບຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ຫາກທ່ານໃສ່ລະຫັດ PIN ຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ຫາກທ່ານໃສ່ລະຫັດຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ຫາກທ່ານໃສ່ຣູບແບບຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ຜູ້ໃຊ້ນີ້ຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ຫາກທ່ານໃສ່ລະຫັດ PIN ຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ຜູ້ໃຊ້ນີ້ຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ຫາກທ່ານໃສ່ລະຫັດຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ຜູ້ໃຊ້ນີ້ຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ຫາກທ່ານໃສ່ຣູບແບບຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ໂປຣໄຟລ໌ບ່ອນເຣັດວຽກຂອງທ່ານ ແລະ ຂໍ້ມູນຂອງມັນຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ຫາກທ່ານໃສ່ລະຫັດ PIN ຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ໂປຣໄຟລ໌ບ່ອນເຣັດວຽກຂອງທ່ານ ແລະ ຂໍ້ມູນຂອງມັນຈະຖືກລຶບອອກ"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ຫາກທ່ານໃສ່ລະຫັດຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ໂປຣໄຟລ໌ບ່ອນເຣັດວຽກຂອງທ່ານ ແລະ ຂໍ້ມູນຂອງມັນຈະຖືກລຶບອອກ"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ພະຍາຍາມປົດລັອກບໍ່ສຳເລັດຫຼາຍເທື່ອເກີນໄປ. ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ພະຍາຍາມປົດລັອກບໍ່ສຳເລັດຫຼາຍເທື່ອເກີນໄປ. ຜູ້ໃຊ້ນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ພະຍາຍາມປົດລັອກບໍ່ສຳເລັດຫຼາຍເທື່ອເກີນໄປ. ໂປຣໄຟລ໌ບ່ອນເຣັດວຽກ ແລະ ຂໍ້ມູນຂອງມັນຈະຖືກລຶບອອກ."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ປິດໄວ້"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ຕ້ອງມີຢ່າງຕ່ຳ <xliff:g id="COUNT">%d</xliff:g> ຕົວອັກສອນ"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ລະ​ຫັດ PIN ຕ້ອງ​ມີ​ຢ່າງ​ໜ້ອຍ <xliff:g id="COUNT">%d</xliff:g> ຕົວເລກ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ດຳເນີນການຕໍ່"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"ຊື່ເຄືອຂ່າຍ"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"ລະບຸ SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ຄວາມ​ປອດ​ໄພ"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"ກຳລັງເປີດໃຊ້ຮັອດສະປອດ..."</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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 card"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"ລຶບຂໍ້ມູນ SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ລຶບຂໍ້ມູນທຸກຢ່າງທີ່ຢູ່ໃນພື້ນທີ່ຈັດເກັບຂໍ້ມູນ USB ພາຍໃນ ເຊັ່ນເພງ ຫຼືຮູບພາບ"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ລຶບຂໍ້ມູນທັງໝົດໃນ SD card ເຊັ່ນ: ເພງ ແລະຮູບພາບ"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"ລຶບລ້າງ eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ລຶບລ້າງ eSIMs ທັງໝົດໃນໂທລະສັບ. ຂັ້ນຕອນນີ້ບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ລຶບລ້າງ eSIMs ທັງໝົດໃນແທັບເລັດ. ຂັ້ນຕອນນີ້ບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ຣີເຊັດແທັບເລັດ"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ຣີເຊັດໂທລະສັບ"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"​ລຶບ​ຂໍ້​ມູນ​ສ່ວນ​ໂຕ ແລະ​ແອັບທີ່​ດາວ​ໂຫລດ​ມາ​ທັງໝົດ​ບໍ? ທ່ານ​ຈະ​ບໍ່​ສາມາດບໍ່​ເຮັດ​ການ​ກະ​ທຳ​ນີ້ໄດ້​ອີກ!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"ໃນ SD card"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ຜູ້ຊ່ວຍປ້ອນຂໍ້ມູນ"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"CPU ຮວມ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ພື້ນໜ້າ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ເຮັດວຽກຕະຫຼອດເວລາ"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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>
@@ -2654,17 +2814,20 @@
       <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="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</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>
     <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_mobile_networks" msgid="8995946622054642367">"ເຄືອຂ່າຍມືຖື, ມືຖື, ຜູ້ໃຫ້ບໍລິການມືຖື, ໄຮ້ສາຍ, ຂໍ້ມູນ, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ທ່າທາງ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ສຳຮອງຂໍ້ມູນ, ສຳຮອງ ຂໍ້ມູນ"</string>
+    <!-- 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>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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>
@@ -3062,14 +3224,14 @@
     <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">"ການຊ່ວຍເຫຼືອ &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_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_app" msgid="6864503001385843060">"(ຄ່າເລີ່ມຕົ້ນ)"</string>
@@ -3095,6 +3257,12 @@
     <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>
+    <!-- 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>
@@ -3102,7 +3270,7 @@
     <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="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>
@@ -3187,8 +3355,9 @@
     <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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"ອະນຸຍາດຈາກແຫລ່ງທີ່ມານີ້"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"ບິດ​ສອງ​ຄັ້ງ​ສຳ​ລັບ​ກ້ອງ​ຖ່າຍ​ຮູບ"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"ເປີດ​ກ້ອງ​ຖ່າຍ​ຮູບ​ໂດຍ​ການ​ບິດ​ຂໍ້​ມື​ຂອງ​ທ່ານ​ສອງ​ຄັ້ງ"</string>
@@ -3236,7 +3403,7 @@
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> used - <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</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">"Wallpaper, sleep, font size"</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>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"ຜູ້ໃຊ້ປັດຈຸບັນ: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">ອະນຸຍາດໃຫ້ 1 ແອັບໄດ້ຮັບອະນຸຍາດໃຫ້ໃຊ້ຂໍ້ມູນແບບບໍ່ຈຳກັດ ເມື່ອຕົວປະຢັດຂໍ້ມູນເປີດຢູ່</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ຕົວປະຢັດຂໍ້ມູນ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ການເຂົ້າເຖິງຂໍ້ມູນແບບບໍ່ຈຳກັດ"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"ຂໍ້ມູນທີ່ບໍ່ຖືກຈຳກັດ"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ຂໍ້ມູນພື້ນຫຼັງຖືກປິດໄວ້"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ເປີດ"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ປິດ"</string>
@@ -3382,7 +3548,6 @@
     <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_warning" msgid="9086859595338944882">"SMS ແບບພຣີມຽມອາດເຮັດໃຫ້ທ່ານເສຍເງິນ ແລະ ຈະເພີ່ມຄ່າໃຊ້ຈ່າຍໃຫ້ກັບບິນຜູ້ໃຫ້ບໍລິການຂອງທ່ານ. ຫາກທ່ານເປີດໃຊ້ສິດອະນຸຍາດໃຫ້ກັບແອັບໃດໜຶ່ງ, ທ່ານຈະສາມາດສົ່ງ SMS ແບບພຣີມຽມໂດຍໃຊ້ແອັບນັ້ນໄດ້."</string>
@@ -3447,28 +3612,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-lt/arrays.xml b/res/values-lt/arrays.xml
index 9b48cb7..1c7be20 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Geras"</item>
     <item msgid="8986346415847956850">"Puikus"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Visada"</item>
-    <item msgid="844721238536786870">"Tik kai įjungtas į lizdą"</item>
-    <item msgid="1986753720941888596">"Niekada"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Visada"</item>
-    <item msgid="7433294150916905997">"Tik kai įjungtas į lizdą"</item>
-    <item msgid="1390404486722375028">"Niekada"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Pastarosios 30 dienų"</item>
     <item msgid="6600989128423965319">"Nustatyti naudojimo ciklą..."</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d980067..1c2bb28 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Atmesti"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Uždaryti"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Perjungti"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nežinomas"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Liko atlikti <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> veiksmą ir būsite kūrėjas.</item>
       <item quantity="few">Liko atlikti <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> veiksmus ir būsite kūrėjas.</item>
@@ -32,6 +31,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 +43,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 +109,26 @@
     <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>
+    <!-- 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">"Neturite leidimo keisti „Bluetooth“ nustatymų."</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>“ matomas netoliese esantiems įrenginiams, kai įjungti „Bluetooth“ nustatymai."</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">"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 +140,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +177,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsų įrenginiai"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +356,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 +383,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Į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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- 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 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 +493,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 +565,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Keisti atrakinimo modelį"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pakeisti atrakinimo PIN kodą"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Pakeisti atrakinimo slaptažodį"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Bandykite dar kartą. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> bandymas iš <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Paskutinis bandymas"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jei šiuo bandymu įvesite netinkamą darbinį atrakinimo piešinį, darbo profilis ir susiję duomenys bus pašalinti iš įrenginio."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jei šiuo bandymu įvesite netinkamą PIN kodą, darbo profilis ir susiję duomenys bus pašalinti iš įrenginio."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jei šiuo bandymu įvesite netinkamą slaptažodį, darbo profilis ir susiję duomenys bus pašalinti iš įrenginio."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Per daug nesėkmingų bandymų. Darbo profilis ir susiję duomenys bus pašalinti iš įrenginio."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Atsisakyti"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Bandykite dar kartą. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> band. iš <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Duomenys bus ištrinti"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jei kitu bandymu nupiešite netinkamą atrakinimo piešinį, šio įrenginio duomenys bus ištrinti"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jei kitu bandymu įvesite netinkamą PIN kodą, šio įrenginio duomenys bus ištrinti"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jei kitu bandymu įvesite netinkamą slaptažodį, šio įrenginio duomenys bus ištrinti"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jei kitu bandymu nupiešite netinkamą atrakinimo piešinį, šis naudotojas bus ištrintas"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jei kitu bandymu įvesite netinkamą PIN kodą, šis naudotojas bus ištrintas"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jei kitu bandymu įvesite netinkamą slaptažodį, šis naudotojas bus ištrintas"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jei kitu bandymu nupiešite netinkamą atrakinimo piešinį, darbo profilis ir jo duomenys bus ištrinti"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jei kitu bandymu įvesite netinkamą PIN kodą, darbo profilis ir jo duomenys bus ištrinti"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jei kitu bandymu įvesite netinkamą slaptažodį, darbo profilis ir jo duomenys bus ištrinti"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Per daug netinkamų bandymų. Šio įrenginio duomenys bus ištrinti."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Per daug netinkamų bandymų. Šis naudotojas bus ištrintas."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Per daug netinkamų bandymų. Šis darbo profilis ir jo duomenys bus ištrinti."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Atsisakyti"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Turi būti bent <xliff:g id="COUNT">%d</xliff:g> simb."</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN kodas turi būti sudarytas bent iš <xliff:g id="COUNT">%d</xliff:g> skaitm."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tęsti"</string>
@@ -648,6 +696,22 @@
     <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>
+    <!-- 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">"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>
@@ -769,7 +833,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Belaidžio maršruto parinktuvo saugos nustatymas (TKIP) nepalaikomas"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Nepavyko autentifikuoti. Bandykite dar kartą."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Aptikta kita WPS sesija. Po kelių minučių bandykite dar kartą."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Atsijungta nuo „Wi‑Fi“. WPS sąranka atšaukta."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Tinklo pavadinimas"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Įveskite SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sauga"</string>
@@ -834,7 +897,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 +933,28 @@
     <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>
+    <!-- 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_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">"Į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 +1001,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>
@@ -1004,23 +1086,33 @@
     <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>
+    <!-- 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">"Pradžios laikas"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Pabaigos laikas"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Įjungta / <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">"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 +1136,19 @@
     <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>
+    <!-- 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">"Pažadinti ekraną, kai gaunamas pranešimas"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Visada įjungta"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Rodymo laikas, pranešimų piktogramos ir kita informacija"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Padidinkite arba sumažinkite tekstą"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
@@ -1299,6 +1402,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>
@@ -1330,6 +1434,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ištrinti SD kortelę"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ištrinti visus vidinės USB atminties duomenis, pvz., muzikos failus ar nuotraukas"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ištrinti visus SD kortelės duomenis, pvz., muzikos failus ar nuotraukas"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Ištrinti eSIM korteles"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ištrinti visas eSIM korteles telefone. Tai atlikus mobiliojo ryšio paslaugos planas nebus atšauktas."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ištrinti visas eSIM korteles planšetiniame kompiuteryje. Tai atlikus mobiliojo ryšio paslaugos planas nebus atšauktas."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Iš naujo nustatyti planšetinį kompiuterį"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Iš naujo nustatyti telefoną"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Ištrinti visą asmeninę informaciją ir atsisiųstas programas? Šio veiksmo negalėsite anuliuoti!"</string>
@@ -1352,26 +1459,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1505,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>
@@ -1519,6 +1620,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"Į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>
@@ -1580,6 +1687,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Vykdoma"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB atmintinė"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kortelėje"</string>
+    <string name="disabled" msgid="9206776641295849915">"Neleidžiama"</string>
     <string name="not_installed" msgid="2797554494953450291">"Neįdiegta šiam naudotojui"</string>
     <string name="installed" msgid="3070865169422600098">"Įdiegta"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nėra programų"</string>
@@ -1689,6 +1797,11 @@
     <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>
+    <!-- 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">"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>
@@ -1915,6 +2028,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 +2100,46 @@
     <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>
+    <!-- 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">"Ekranas"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Žibintuvėlis"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparatas"</string>
@@ -1995,7 +2154,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2207,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2706,17 +2868,20 @@
       <item quantity="other">Rodyti %d paslėptų elementų</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Tinkas ir internetas"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"„Wi-Fi“, mobil., duom. naudojimas, vieš. int. pri. tašk."</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilusis"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"duomenų naudojimas"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"viešosios interneto prieigos taškas"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Prijungti įrenginiai"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"„Bluetooth“, perdavimas, ALR"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"„Bluetooth“, perdavimas"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programos ir pranešimai"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Leidimai, numatytosios programos"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Naudotojai ir paskyros"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Numatytosios programos"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Kalbos, laikas, atsarginė kopija, naujiniai"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nustatymai"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Ieškoti nustatymų"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Ieškoti nustatymų"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Paieškos nustatymai"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Paieškos nustatymai"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"„Wi-Fi“, tinklo ryšys"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"teksto pranešimas, teksto pranešimų siuntimas, pranešimai, susirašinėjimas"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilusis, mobiliojo ryšio operatorius, belaidis, duomenys, 4G, 3G, 2G, LTE"</string>
@@ -2761,6 +2926,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gestas"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"mokėti, paliesti, mokėjimai"</string>
     <string name="keywords_backup" msgid="470070289135403022">"atsarginė kopija, kurti atsarginę kopiją"</string>
+    <!-- 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">"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>
@@ -2889,8 +3060,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>
@@ -3029,11 +3198,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 +3205,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>
@@ -3114,7 +3278,7 @@
     <string name="configure_apps" msgid="6685680790825882528">"Programų konfigūravimas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nežinoma programa"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Programos leidimai"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"Programos, naudojančios: <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Programos, naudojančios <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Paliesti ir pažadinti"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Dukart palieskite bet kurioje ekrano vietoje, kad pažadintumėte įrenginį"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Atidarymo nuorodos"</string>
@@ -3167,6 +3331,14 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Naudojimo įspėjimai"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Rodyti visą įrenginio naudojimo informaciją"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Rodyti progr. naud. inform."</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Intensyvus naudojimas"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> programa veikia neįprastai</item>
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> programos veikia neįprastai</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> programos veikia neįprastai</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> programų veikia neįprastai</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3433,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Nežinomų programų diegimas"</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>
@@ -3274,8 +3447,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Programos leidimas keisti sistemos nustatymus"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Leisti keisti sistemos nustatymus"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Programai bus leidžiama keisti sistemos nustatymus."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Taip"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Leisti iš šio šaltinio"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dukart pasukti, kad fotoap. pr. būtų at."</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Atidarykite fotoaparato programą dukart pasukę riešą"</string>
@@ -3372,8 +3543,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 +3567,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>
@@ -3464,7 +3634,6 @@
     <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="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>
@@ -3535,28 +3704,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiniai"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Neautomatiniai"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Atlaisvinkite vietos dabar"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestai"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Gestų spartieji klavišai"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Spartieji gestai, skirti valdyti telefoną"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Spartieji gestai, skirti valdyti planšetinį kompiuterį"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Spartieji gestai, skirti valdyti įrenginį"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Fotoaparato įjungimas"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Jei norite greitai atidaryti fotoaparatą, dukart paspauskite maitinimo mygtuką. Veikia bet kuriame ekrane."</string>
+    <!-- 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">"Fotoaparato perjungimas"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Pakelti, kad fotoaparatas būtų atidarytas"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Jei norite automatiškai atidaryti fotoaparatą, pakelkite telefoną į fotografavimo padėtį (laikydami gulsčiai arba stačiai). Veikia, kai telefonas veikia miego režimu arba yra užrakintas."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotograf., kai telefonas veikia miego režimu arba yra užrak."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Pagalbinis gestas"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Jautrumas"</string>
@@ -3674,6 +3870,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 +3884,10 @@
     <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>
+    <!-- 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-lv/arrays.xml b/res/values-lv/arrays.xml
index 94d6557..4d26a15 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Labs"</item>
     <item msgid="8986346415847956850">"Teicams"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Vienmēr"</item>
-    <item msgid="844721238536786870">"Tikai ja pieslēgts pie strāvas"</item>
-    <item msgid="1986753720941888596">"Nekad"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Vienmēr"</item>
-    <item msgid="7433294150916905997">"Tikai ja pieslēgts pie strāvas"</item>
-    <item msgid="1390404486722375028">"Nekad"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Pēdējās 30 dienas"</item>
     <item msgid="6600989128423965319">"Iestatīt lietojuma ciklu…"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 16be87c..f5c6a37 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Aizliegt"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Aizvērt"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Pārslēgt"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nezināms"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="zero">Lai jūs kļūtu par izstrādātāju, atlikušas <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> darbības.</item>
       <item quantity="one">Lai jūs kļūtu par izstrādātāju, atlikusi <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> darbība.</item>
@@ -31,6 +30,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 +42,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 +108,26 @@
     <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>
+    <!-- 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">"Jums nav atļaujas mainīt Bluetooth iestatījumus."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +139,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +176,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsu ierīces"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +354,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 +380,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +490,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 +562,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Atbloķēšanas kombinācijas maiņa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mainīt atbloķēšanas PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mainīt atbloķēšanas paroli"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Mēģiniet vēlreiz (<xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. mēģinājums no <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>)."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Pēdējais mēģinājums"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ja šajā mēģinājumā ievadīsiet nepareizu kombināciju, jūsu darba profils un ar to saistītie dati tiks noņemti no šīs ierīces."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ja šajā mēģinājumā ievadīsiet nepareizu PIN, jūsu darba profils un ar to saistītie dati tiks noņemti no šīs ierīces."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ja šajā mēģinājumā ievadīsiet nepareizu paroli, jūsu darba profils un ar to saistītie dati tiks noņemti no šīs ierīces."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Pārāk daudz neveiksmīgu mēģinājumu. Jūsu darba profils un ar to saistītie dati tiks noņemti no šīs ierīces."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Nerādīt"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Mēģiniet vēlreiz (<xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. mēģinājums no <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>)."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Jūsu dati tiks dzēsti."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ja nākamajā mēģinājumā ievadīsiet nepareizu kombināciju, dati šajā ierīcē tiks dzēsti."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ja nākamajā mēģinājumā ievadīsiet nepareizu PIN, dati šajā ierīcē tiks dzēsti."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ja nākamajā mēģinājumā ievadīsiet nepareizu paroli, dati šajā ierīcē tiks dzēsti."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ja nākamajā mēģinājumā ievadīsiet nepareizu kombināciju, šis lietotājs tiks dzēsts."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ja nākamajā mēģinājumā ievadīsiet nepareizu PIN, šis lietotājs tiks dzēsts."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ja nākamajā mēģinājumā ievadīsiet nepareizu paroli, šis lietotājs tiks dzēsts."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ja nākamajā mēģinājumā ievadīsiet nepareizu kombināciju, jūsu darba profils un ar to saistītie dati tiks dzēsti."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ja nākamajā mēģinājumā ievadīsiet nepareizu PIN, jūsu darba profils un ar to saistītie dati tiks dzēsti."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ja nākamajā mēģinājumā ievadīsiet nepareizu paroli, jūsu darba profils un ar to saistītie dati tiks dzēsti."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Pārāk daudz neveiksmīgu mēģinājumu. Dati šajā ierīcē tiks dzēsti."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Pārāk daudz neveiksmīgu mēģinājumu. Šis lietotājs tiks dzēsts."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Pārāk daudz neveiksmīgu mēģinājumu. Šis darba profils un ar to saistītie dati tiks dzēsti."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Nerādīt"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Ir jāietver vismaz <xliff:g id="COUNT">%d</xliff:g> rakstzīmes."</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN kodā ir jāietver vismaz <xliff:g id="COUNT">%d</xliff:g> cipari."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Turpināt"</string>
@@ -637,6 +685,22 @@
     <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>
+    <!-- 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">"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>
@@ -758,7 +822,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Bezvadu maršrutētāja drošības iestatījums (TKIP) netiek atbalstīts."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificēšana neizdevās. Lūdzu, mēģiniet vēlreiz."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tika noteikta cita WPS sesija. Lūdzu, pēc dažām minūtēm mēģiniet vēlreiz."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Tika pārtraukts Wi‑Fi savienojums. WPS iestatīšana tika atcelta."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Tīkla nosaukums"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Ievadiet SSID."</string>
     <string name="wifi_security" msgid="6603611185592956936">"Drošība"</string>
@@ -822,7 +885,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 +921,28 @@
     <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>
+    <!-- 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_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">"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 +989,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>
@@ -992,30 +1074,40 @@
     <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>
+    <!-- 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">"Sākuma laiks"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Beigu laiks"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Ieslēgts/<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">"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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Noklusējums"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Pielāgota"</string>
-    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Mainīt fona tapeti"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Fona tapetes mainīšana"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Ekrāna personalizēšana"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fona tapetes izvēle no"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Ekrānsaudzētājs"</string>
@@ -1032,8 +1124,19 @@
     <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>
+    <!-- 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">"Aktivizēt ekrānu, kad tiek saņemts paziņojums"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Vienmēr ieslēgts"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tiek rādīts laiks, paziņojumu ikonas un cita informācija."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Palielināt vai samazināt tekstu"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kartes bloķēšanas iestatījumi"</string>
@@ -1286,6 +1389,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>
@@ -1316,6 +1420,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Dzēst SD karti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Dzēst visus iekšējā USB atmiņā saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izdzēst visus SD kartē saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Dzēst eSIM kartes"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Dzēsiet visas tālrunī esošās eSIM kartes. Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Dzēsiet visas planšetdatorā esošās eSIM kartes. Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Atiestatīt planšetdatoru"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Atiestatīt tālruni"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vai dzēst visu jūsu personīgo informāciju un visas lejupielādētās lietotnes? Šo darbību nevarēs atsaukt."</string>
@@ -1338,26 +1445,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1491,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>
@@ -1505,6 +1606,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1565,6 +1672,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Darbojas"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB krātuve"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartē"</string>
+    <string name="disabled" msgid="9206776641295849915">"Atspējots"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nav instalēta šim lietotājam"</string>
     <string name="installed" msgid="3070865169422600098">"Instalēta"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nav lietotņu"</string>
@@ -1674,6 +1782,11 @@
     <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>
+    <!-- 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">"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>
@@ -1894,6 +2007,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 +2078,46 @@
     <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>
+    <!-- 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">"Ekrāns"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Zibspuldze"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1974,7 +2132,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2185,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2680,16 +2841,19 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Noklusējuma lietotnes"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Valodas, laiks, dublēšana, atjauninājumi"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Iestatījumi"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Meklēt iestatījumus"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Meklēšanas iestatījumi"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Meklēšanas iestatījumi"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, Wi-Fi, tīkla savienojums"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"īsziņa, sūtīt īsziņu, ziņas, ziņojumapmaiņa"</string>
@@ -2735,6 +2899,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"žests"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"maksāt, pieskarties, maksājumi"</string>
     <string name="keywords_backup" msgid="470070289135403022">"dublēšana, dublēt"</string>
+    <!-- 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">"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>
@@ -2861,8 +3031,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>
@@ -2997,11 +3165,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 +3172,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 +3294,13 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3394,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalēt nez. lietotnes"</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>
@@ -3237,8 +3408,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Atļauja lietotnei pārveidot sistēmas iestatījumus"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Atļaut pārveidot sistēmas iestatījumus"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ar šo atļauju lietotnes var pārveidot sistēmas iestatījumus."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Jā"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nē"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Atļaut no šī avota"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Pagriešana divreiz kameras atvēršanai"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Atvērt kameras lietotni, divreiz pagriežot plaukstas locītavu"</string>
@@ -3334,8 +3503,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 +3525,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>
@@ -3423,7 +3591,6 @@
     <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="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>
@@ -3491,28 +3658,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automātiski"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuāli"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Atbrīvot vietu"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Žesti"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Žestu saīsnes"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Ātri žesti tālruņa pārvaldībai"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Ātri žesti planšetdatora pārvaldībai"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Ātri žesti ierīces pārvaldībai"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Pāriešana uz kameru"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Lai ātri atvērtu kameru, divreiz nospiediet barošanas pogu. Šī funkcija darbojas jebkurā ekrānā."</string>
+    <!-- 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">"Apvērst kameru"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Pavirzīt augšup, lai atvērtu kameru"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Lai atvērtu kameru automātiski, paceliet tālruni augšup fotoattēla uzņemšanas pozīcijā (ainavas vai portreta orientācijā). Automātiskā atvēršana darbojas, kad tālrunis ir miega režīmā vai bloķēts."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Uzņemt fotoattēlus, kad tālrunis ir miega režīmā vai bloķēts"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Palīga žests"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Jutīgums"</string>
@@ -3623,6 +3817,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>
@@ -3636,5 +3831,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Tūlītējā lietotne"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vai izslēgt krātuves pārvaldnieku?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Filmu un TV pārraižu lietotnes"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Izmantotā vieta krātuvē"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informācija par operatora nodrošināšanu"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizēt operatora nodrošināšanu"</string>
+    <!-- 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-mcc262-mnc02-af/strings.xml b/res/values-mcc262-mnc02-af/strings.xml
new file mode 100644
index 0000000..557ded3
--- /dev/null
+++ b/res/values-mcc262-mnc02-af/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Jy kan nie noodoproepe met Wi-Fi-oproepe maak nie. As jy probeer om \'n noodoproep te maak, sal jou toestel outomaties die mobiele netwerk gebruik. Noodoproepe kan net gemaak word in gebiede met selnetwerkdekking."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-am/strings.xml b/res/values-mcc262-mnc02-am/strings.xml
new file mode 100644
index 0000000..d65f1c8
--- /dev/null
+++ b/res/values-mcc262-mnc02-am/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"በWi-Fi ጥሪ ማድረጊያ በኩል የአደጋ ጥሪዎችን ማድረግ አይችሉም።  የአደጋ ጥሪ ለማድረግ ከሞከሩ የእርስዎ መሣሪያ በራስሰር የሞባይል አውታረመረቡን ይጠቀማል። የአደጋ ጥሪዎች የሞባይል አውታረ መረብ ሽፋን ባለባቸው አካባቢዎች ብቻ ይደረጋሉ።"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ar/strings.xml b/res/values-mcc262-mnc02-ar/strings.xml
new file mode 100644
index 0000000..852ae302
--- /dev/null
+++ b/res/values-mcc262-mnc02-ar/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">"‏\n\nلا يمكنك إجراء مكالمات الطوارئ من خلال الاتصال عبر Wi-Fi. إذا حاولت إجراء مكالمة طوارئ، سيستخدم جهازك تلقائيًا شبكة الجوّال. يمكن إجراء مكالمات الطوارئ فقط في المناطق التي تشتمل على تغطية لشبكة الجوّال."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-az/strings.xml b/res/values-mcc262-mnc02-az/strings.xml
new file mode 100644
index 0000000..78e5c6d
--- /dev/null
+++ b/res/values-mcc262-mnc02-az/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi vasitəsilə təcili zənglər edə bilməzsiniz. Əgər təcili zəng etməyə çalışsanız, cihaz avtomatik olaraq mobil şəbəkədən istifadə edəcək. Təcili zənglər təkcə mobil şəbəkə əhatəsində olan ərazilərdə edilə bilər."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-b+sr+Latn/strings.xml b/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..cdf2c42
--- /dev/null
+++ b/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ne možete da upućujete hitne pozive pomoću pozivanja preko Wi-Fi-ja. Ako probate da uputite hitan poziv, uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi mogu da se upućuju samo u oblastima pokrivenim mobilnom mrežom."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-be/strings.xml b/res/values-mcc262-mnc02-be/strings.xml
new file mode 100644
index 0000000..1098c18
--- /dev/null
+++ b/res/values-mcc262-mnc02-be/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Вы не можаце рабіць экстранныя выклікі з дапамогай Wi-Fi-тэлефаніі. Калі вы паспрабуеце зрабіць экстранны выклік, ваша прылада аўтаматычна выкарыстае мабільную сетку. Экстранныя выклікі можна рабіць толькі ў зонах пакрыцця мабільнай сеткі."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-bg/strings.xml b/res/values-mcc262-mnc02-bg/strings.xml
new file mode 100644
index 0000000..0aea8da
--- /dev/null
+++ b/res/values-mcc262-mnc02-bg/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Не можете да извършвате спешни обаждания чрез функцията Обаждания през Wi-Fi. Ако опитате да го направите, устройството ви автоматично ще използва мобилната мрежа. Спешните обаждания могат да бъдат осъществявани само в райони с покритие за мобилна мрежа."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-bn/strings.xml b/res/values-mcc262-mnc02-bn/strings.xml
new file mode 100644
index 0000000..1b66ebf
--- /dev/null
+++ b/res/values-mcc262-mnc02-bn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ওয়াই-ফাই এর মাধ্যমে জরুরী কল করা যাবে না। জরুরী কল করার চেষ্টা করলে আপনার ডিভাইস নিজে থেকেই মোবাইল নেটওয়ার্ক ব্যবহার করতে শুরু করবে। যেখানে মোবাইল নেটওয়ার্ক কভারেজ আছে, শুধুমাত্র সেখানেই জরুরী কল করা যাবে।"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-bs/strings.xml b/res/values-mcc262-mnc02-bs/strings.xml
new file mode 100644
index 0000000..cbf6ad6
--- /dev/null
+++ b/res/values-mcc262-mnc02-bs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ne možete upućivati hitne pozive putem Wi-Fi pozivanja. Ukoliko pokušate uputiti hitan poziv, vaš uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi se mogu obavljati isključivo u području pokrivenom mobilnom mrežom."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ca/strings.xml b/res/values-mcc262-mnc02-ca/strings.xml
new file mode 100644
index 0000000..48107c1
--- /dev/null
+++ b/res/values-mcc262-mnc02-ca/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"No pots fer trucades d\'emergència per Wi-Fi. Si proves de fer-ho, el dispositiu utilitzarà automàticament la xarxa de telefonia mòbil. Les trucades d\'emergència només es poden fer en zones amb cobertura de telefonia mòbil."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-cs/strings.xml b/res/values-mcc262-mnc02-cs/strings.xml
new file mode 100644
index 0000000..99f2183
--- /dev/null
+++ b/res/values-mcc262-mnc02-cs/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Prostřednictvím volání přes Wi-Fi nelze uskutečňovat tísňová volání. Pokud se pokusíte zavolat na tísňovou linku, zařízení automaticky použije mobilní síť. Tísňová volání lze uskutečňovat jen v oblastech pokrytých mobilní sítí."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-da/strings.xml b/res/values-mcc262-mnc02-da/strings.xml
new file mode 100644
index 0000000..46596f4
--- /dev/null
+++ b/res/values-mcc262-mnc02-da/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Du kan ikke foretage nødopkald med Opkald via Wi-Fi. Hvis du prøver at foretage et nødopkald, anvender enheden automatisk dit mobilnetværk. Nødopkald kan kun foretages i områder med dækning af dit mobilnetværk."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-de/strings.xml b/res/values-mcc262-mnc02-de/strings.xml
new file mode 100644
index 0000000..4cb45d4
--- /dev/null
+++ b/res/values-mcc262-mnc02-de/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Du kannst von deinem Gerät via \"Anrufe über WLAN\" keine Notrufe tätigen. Wenn du versuchst, den Notruf zu erreichen, nutzt dein Gerät automatisch das Mobilfunknetz. Notrufe sind nur an Orten mit Mobilfunkabdeckung möglich."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-el/strings.xml b/res/values-mcc262-mnc02-el/strings.xml
new file mode 100644
index 0000000..4dc42c5
--- /dev/null
+++ b/res/values-mcc262-mnc02-el/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Δεν μπορείτε να πραγματοποιείτε κλήσεις έκτακτης ανάγκης μέσω της Κλήσης Wi-Fi. Εάν προσπαθήσετε να πραγματοποιήσετε μια κλήση έκτακτης ανάγκης, η συσκευή σας θα χρησιμοποιήσει αυτόματα το δίκτυο κινητής τηλεφωνίας. Οι κλήσεις έκτακτης ανάγκης μπορούν να πραγματοποιηθούν μόνο σε περιοχές με κάλυψη δικτύου κινητής τηλεφωνίας."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-en-rAU/strings.xml b/res/values-mcc262-mnc02-en-rAU/strings.xml
new file mode 100644
index 0000000..45cff38
--- /dev/null
+++ b/res/values-mcc262-mnc02-en-rAU/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-en-rGB/strings.xml b/res/values-mcc262-mnc02-en-rGB/strings.xml
new file mode 100644
index 0000000..45cff38
--- /dev/null
+++ b/res/values-mcc262-mnc02-en-rGB/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-en-rIN/strings.xml b/res/values-mcc262-mnc02-en-rIN/strings.xml
new file mode 100644
index 0000000..45cff38
--- /dev/null
+++ b/res/values-mcc262-mnc02-en-rIN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"You can’t make emergency calls through Wi-Fi calling. If you try to make an emergency call, your device will automatically use the mobile network. Emergency calls can only be made in areas with mobile network coverage."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-es-rUS/strings.xml b/res/values-mcc262-mnc02-es-rUS/strings.xml
new file mode 100644
index 0000000..dbfe694
--- /dev/null
+++ b/res/values-mcc262-mnc02-es-rUS/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"No puedes usar las llamadas por Wi-Fi para hacer llamadas de emergencia. Si lo intentas, el dispositivo se conectará automáticamente a la red móvil. Solo puedes hacer este tipo de llamadas en zonas con cobertura de red móvil."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-es/strings.xml b/res/values-mcc262-mnc02-es/strings.xml
new file mode 100644
index 0000000..453decf
--- /dev/null
+++ b/res/values-mcc262-mnc02-es/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"No puedes utilizar las llamadas por Wi-Fi para hacer llamadas de emergencia. Si lo intentas, el dispositivo se conectará automáticamente a la red móvil. Solo puedes hacer este tipo de llamadas en zonas con cobertura de red móvil."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-et/strings.xml b/res/values-mcc262-mnc02-et/strings.xml
new file mode 100644
index 0000000..19b7dbc
--- /dev/null
+++ b/res/values-mcc262-mnc02-et/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Te ei saa WiFi-kõnede kaudu hädaabikõnesid teha. Kui proovite teha hädaabikõnet, kasutab seade automaatselt mobiilsidevõrku. Hädaabikõnesid saab teha ainult mobiilsidevõrgu katvusega piirkondades."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-eu/strings.xml b/res/values-mcc262-mnc02-eu/strings.xml
new file mode 100644
index 0000000..cac4c72
--- /dev/null
+++ b/res/values-mcc262-mnc02-eu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ezin duzu egin larrialdi-deirik Wi-Fi bidez. Larrialdi-dei bat egiten saiatzen bazara, gailua sare mugikorrera aldatuko da automatikoki. Sare mugikorren estaldura-eremuetan bakarrik egin daitezke larrialdi-deiak."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-fa/strings.xml b/res/values-mcc262-mnc02-fa/strings.xml
new file mode 100644
index 0000000..1440fc6
--- /dev/null
+++ b/res/values-mcc262-mnc02-fa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">"‏\n\nنمی‌توانید با تماس ازطریق Wi-Fi، تماس‌های اضطراری برقرار کنید. اگر در تلاشید تماس اضطراری برقرار کنید، دستگاه شما به‌طور خودکار از شبکه دستگاه همراه استفاده می‌کند. فقط در مناطقی که پوشش شبکه دستگاه همراه دارند می‌توان تماس‌های اضطراری برقرار کرد."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-fi/strings.xml b/res/values-mcc262-mnc02-fi/strings.xml
new file mode 100644
index 0000000..0108dad
--- /dev/null
+++ b/res/values-mcc262-mnc02-fi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Hätäpuheluja ei voi soittaa Wi-Fi-verkossa. Laite käyttää hätäpuhelun soittamiseen automaattisesti mobiiliverkkoa. Hätäpuhelun soittaminen on mahdollista vain mobiiliverkon peittoalueella."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-fr-rCA/strings.xml b/res/values-mcc262-mnc02-fr-rCA/strings.xml
new file mode 100644
index 0000000..92c8a27
--- /dev/null
+++ b/res/values-mcc262-mnc02-fr-rCA/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Vous ne pouvez pas effectuer d\'appels d\'urgence à l\'aide des appels Wi-Fi. Si vous essayez de faire un appel d\'urgence, votre appareil utilisera automatiquement le réseau cellulaire. Les appels d\'urgence ne sont possibles que dans les zones disposant d\'une couverture réseau cellulaire."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-fr/strings.xml b/res/values-mcc262-mnc02-fr/strings.xml
new file mode 100644
index 0000000..63e2f57
--- /dev/null
+++ b/res/values-mcc262-mnc02-fr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Vous ne pouvez pas effectuer d\'appels d\'urgence via les appels Wi-Fi. Si vous essayez de passer un appel d\'urgence, votre appareil utilisera automatiquement le réseau mobile. Les appels d\'urgence ne sont possibles que dans les zones disposant d\'une couverture réseau mobile."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-gl/strings.xml b/res/values-mcc262-mnc02-gl/strings.xml
new file mode 100644
index 0000000..2c70218
--- /dev/null
+++ b/res/values-mcc262-mnc02-gl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Non podes facer chamadas de emerxencia mediante as chamadas por wifi. Se tentas realizar unha chamada de emerxencia, o dispositivo utilizará automaticamente a rede móbil. As chamadas de emerxencia só se poden facer en zonas con cobertura de rede de telefonía móbil."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-gu/strings.xml b/res/values-mcc262-mnc02-gu/strings.xml
new file mode 100644
index 0000000..ac24429
--- /dev/null
+++ b/res/values-mcc262-mnc02-gu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"તમે Wi-Fi કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-hi/strings.xml b/res/values-mcc262-mnc02-hi/strings.xml
new file mode 100644
index 0000000..496c6a6
--- /dev/null
+++ b/res/values-mcc262-mnc02-hi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"आप वाई-फ़ाई कॉलिंग के ज़रिए आपातकालीन कॉल नहीं कर सकते हैं. अगर आप आपातकालीन कॉल करने की कोशिश कर रहे हैं, तो आपका डिवाइस अपने आप मोबाइल नेटवर्क का उपयोग करेगा. आपातकालीन कॉल केवल मोबाइल नेटवर्क कवरेज वाले क्षेत्रों से किए जा सकते हैं."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-hr/strings.xml b/res/values-mcc262-mnc02-hr/strings.xml
new file mode 100644
index 0000000..1b1500e
--- /dev/null
+++ b/res/values-mcc262-mnc02-hr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi pozivi ne mogu se upotrebljavati za hitne pozive. Ako pokušate uputiti hitni poziv, uređaj će automatski prijeći na mobilnu mrežu. Hitni se pozivi mogu upućivati samo u područjima pokrivenim mobilnom mrežom."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-hu/strings.xml b/res/values-mcc262-mnc02-hu/strings.xml
new file mode 100644
index 0000000..f299826
--- /dev/null
+++ b/res/values-mcc262-mnc02-hu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi-hívással nem tud vészhívást kezdeményezni. Vészhívás kezdeményezéséhez eszköze automatikusan mobilhálózatra vált. Vészhívást csak hálózatilag lefedett helyekről indíthat."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-hy/strings.xml b/res/values-mcc262-mnc02-hy/strings.xml
new file mode 100644
index 0000000..9bcea7e
--- /dev/null
+++ b/res/values-mcc262-mnc02-hy/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Դուք չեք կարող կատարել շտապ կանչեր` զանգելով Wi-Fi կապ միջոցով: Շտապ կանչի զանգ կատարելու փորձի դեպքում ձեր հեռախոսն ավտոմատ կերպով կմիանա բջջային ցանցին: Շտապ կանչերը կարող են կատարվել միայն բջջային ցանցի ծածկույթում:"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-in/strings.xml b/res/values-mcc262-mnc02-in/strings.xml
new file mode 100644
index 0000000..3a3a302
--- /dev/null
+++ b/res/values-mcc262-mnc02-in/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Anda tidak dapat melakukan panggilan darurat melalui panggilan Wi-Fi. Jika mencoba melakukan panggilan darurat, perangkat akan otomatis menggunakan jaringan seluler. Panggilan darurat hanya dapat dilakukan di area dengan cakupan jaringan seluler."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-is/strings.xml b/res/values-mcc262-mnc02-is/strings.xml
new file mode 100644
index 0000000..f44c667
--- /dev/null
+++ b/res/values-mcc262-mnc02-is/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ekki er hægt að hringja neyðarsímtöl með Wi-Fi símtölum. Ef þú hringir neyðarsímtal mun tækið notast sjálfkrafa við farsímakerfið. Eingöngu er hægt að hringja neyðarsímtöl á svæðum með tengingu við farsímakerfi."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-it/strings.xml b/res/values-mcc262-mnc02-it/strings.xml
new file mode 100644
index 0000000..80e1723
--- /dev/null
+++ b/res/values-mcc262-mnc02-it/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Non puoi fare chiamate di emergenza tramite la funzione Chiamate Wi-Fi. Se provi a fare una chiamata di emergenza, il dispositivo userà automaticamente la rete mobile. È possibile fare chiamate di emergenza soltanto nelle zone coperte dalla rete mobile."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-iw/strings.xml b/res/values-mcc262-mnc02-iw/strings.xml
new file mode 100644
index 0000000..94cb402
--- /dev/null
+++ b/res/values-mcc262-mnc02-iw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">"‏\n\nלא ניתן לבצע שיחות חירום באמצעות שיחות Wi-Fi. אם תנסה לבצע שיחת חירום, המכשיר ישתמש באופן אוטומטי ברשת הסלולרית. ניתן לבצע שיחות חירום רק באזורים עם כיסוי רשת סלולרית."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ja/strings.xml b/res/values-mcc262-mnc02-ja/strings.xml
new file mode 100644
index 0000000..e7ca679
--- /dev/null
+++ b/res/values-mcc262-mnc02-ja/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi 通話で緊急通報を行うことはできません。緊急通報を試みると、端末は自動的にモバイル ネットワークを使用します。緊急通報は、モバイル ネットワーク対応のエリア内でのみ行えます。"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ka/strings.xml b/res/values-mcc262-mnc02-ka/strings.xml
new file mode 100644
index 0000000..fc4b903
--- /dev/null
+++ b/res/values-mcc262-mnc02-ka/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"გადაუდებელი ზარების Wi-Fi-ს მეშვეობით განხორციელება ვერ მოხერხდება. თუ გადაუდებელი ზარის გაშვებას ეცდებით, თქვენი მოწყობილობა ავტომატურად გამოიყენებს მობილურ ქსელს. გადაუდებელი ზარების განხორციელება მხოლოდ იმ ტერიტორიებზეა შესაძლებელი, რომელზეც მობილური ქსელის დაფარვა ვრცელდება."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-kk/strings.xml b/res/values-mcc262-mnc02-kk/strings.xml
new file mode 100644
index 0000000..5241b1a
--- /dev/null
+++ b/res/values-mcc262-mnc02-kk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Сіз Wi-Fi қоңырауы арқылы жедел қызметке қоңырау шала алмайсыз. Егер жедел қызметке қоңырау шалғыңыз келсе, құрылғыңыз автоматты түрде мобильдік желіні қолданады. Тек мобильдік желі бар аймақтарда ғана жедел қызметке қоңырау шалуға болады."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-km/strings.xml b/res/values-mcc262-mnc02-km/strings.xml
new file mode 100644
index 0000000..1b04dea
--- /dev/null
+++ b/res/values-mcc262-mnc02-km/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"អ្នកមិនអាចធ្វើការហៅបន្ទាន់តាមរយៈការហៅទូរសព្ទដោយប្រើ Wi-Fi បានទេ។ ប្រសិនបើអ្នកព្យាយាមធ្វើការហៅបន្ទាន់ ឧបករណ៍របស់អ្នកនឹងប្រើបណ្ដាញ​ទូរសព្ទ​ចល័តដោយស្វ័យប្រវត្តិ។ ការហៅបន្ទាន់អាចធ្វើបានតែក្នុងតំបន់ដែលមានការគ្របដណ្តប់បណ្តាញ​ទូរសព្ទ​ចល័តតែប៉ុណ្ណោះ។"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-kn/strings.xml b/res/values-mcc262-mnc02-kn/strings.xml
new file mode 100644
index 0000000..9e87f57
--- /dev/null
+++ b/res/values-mcc262-mnc02-kn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ನೀವು ವೈ-ಫೈ ಕರೆಯ ಮೂಲಕ ತುರ್ತು ಕರೆಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ನೀವು ತುರ್ತು ಕರೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿದರೆ, ನಿಮ್ಮ ಸಾಧನ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಬಳಸುತ್ತದೆ. ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಲಭ್ಯ ಇರುವಲ್ಲಿ ಮಾತ್ರ ತುರ್ತು ಕರೆಗಳನ್ನು ಮಾಡಬಹುದು."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ko/strings.xml b/res/values-mcc262-mnc02-ko/strings.xml
new file mode 100644
index 0000000..8b6b40f
--- /dev/null
+++ b/res/values-mcc262-mnc02-ko/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi 통화로는 긴급 전화를 걸 수 없습니다. 긴급 전화를 걸 경우 기기에서 자동으로 모바일 네트워크가 사용됩니다. 긴급 전화는 모바일 네트워크가 제공되는 지역에서만 걸 수 있습니다."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ky/strings.xml b/res/values-mcc262-mnc02-ky/strings.xml
new file mode 100644
index 0000000..12d5d6b
--- /dev/null
+++ b/res/values-mcc262-mnc02-ky/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n" Өзгөчө кырдаалда Wi-Fi чалуу кызматынан чала албайсыз. Өзгөчө кырдаалда чалууга аракет кылганыңызда түзмөгүңүз автоматтык түрдө мобилдик тармакты пайдаланат. Өзгөчө кырдаалда чалууларды мобилдик тармак кармаган аймактарда гана аткара аласыз."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-lo/strings.xml b/res/values-mcc262-mnc02-lo/strings.xml
new file mode 100644
index 0000000..449655b
--- /dev/null
+++ b/res/values-mcc262-mnc02-lo/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ທ່ານບໍ່ສາມາດໂທສຸກເສີນຜ່ານການໂທ Wi-Fi ໄດ້. ຫາກທ່ານລອງໂທສຸກເສີນ, ອຸປະກອນຂອງທ່ານຈະໃຊ້ເຄືອຂ່າຍມືຖືໂດຍອັດຕະໂນມັດ. ການໂທສຸກເສີນຈະເກີດຂຶ້ນຜ່ານເຄືອຂ່າຍມືຖືໄດ້ເທົ່ານັ້ນ."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-lt/strings.xml b/res/values-mcc262-mnc02-lt/strings.xml
new file mode 100644
index 0000000..1aeeca4
--- /dev/null
+++ b/res/values-mcc262-mnc02-lt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Negalite atlikti skambučių pagalbos numeriais naudodami „Wi-Fi“ skambinimą. Jei bandysite atlikti skambutį pagalbos numeriu, įrenginys automatiškai naudos mobiliojo ryšio tinklą. Skambučius pagalbos numeriais galite atlikti tik tose srityse, kuriose veikia mobiliojo ryšio tinklas."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-lv/strings.xml b/res/values-mcc262-mnc02-lv/strings.xml
new file mode 100644
index 0000000..d6c7f88
--- /dev/null
+++ b/res/values-mcc262-mnc02-lv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Jūs nevarat veikt ārkārtas izsaukumus, izmantojot Wi-Fi zvanus. Ja mēģināsiet veikt ārkārtas izsaukumu, jūsu ierīcē tiks automātiski izmantots mobilais tīkls. Ārkārtas izsaukumus var veikt tikai apgabalos ar mobilā tīkla pārklājumu."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-mk/strings.xml b/res/values-mcc262-mnc02-mk/strings.xml
new file mode 100644
index 0000000..bee5428
--- /dev/null
+++ b/res/values-mcc262-mnc02-mk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Не може да воспоставите итни повици преку Wi-Fi. Ако се обидете да воспоставите итен повик, уредот автоматски ќе ја користи мобилната мрежа. Итните повици може да се воспостават само во области покриени со мобилна мрежа."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ml/strings.xml b/res/values-mcc262-mnc02-ml/strings.xml
new file mode 100644
index 0000000..3304a0e
--- /dev/null
+++ b/res/values-mcc262-mnc02-ml/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"വൈഫൈ കോളിംഗിലൂടെ നിങ്ങൾക്ക് അടിയന്തിര കോളുകൾ വിളിക്കാനാകില്ല. നിങ്ങൾ ഒരു അടിയന്തിര കോൾ ചെയ്യാൻ ശ്രമിച്ചാൽ, നിങ്ങളുടെ ഉപകരണം സ്വയമേവ മൊബൈല്‍ നെറ്റ്‍വര്‍ക്ക് ഉപയോഗിക്കും. മൊബൈല്‍ നെറ്റ്‍വര്‍ക്കുള്ള സ്ഥലങ്ങളിൽ മാത്രമേ അടിയന്തിര കോളുകൾ ചെയ്യാനാവൂ."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-mn/strings.xml b/res/values-mcc262-mnc02-mn/strings.xml
new file mode 100644
index 0000000..4045045
--- /dev/null
+++ b/res/values-mcc262-mnc02-mn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Та Wi-Fi дуудлагаар яаралтай дуудлага хийх боломжгүй. Хэрэв та яаралтай дуудлага хийвэл таны төхөөрөмж мобайл сүлжээг автоматаар ашиглана. Яаралтай дуудлагыг зөвхөн мобайл сүлжээтэй газар хийх боломжтой."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-mr/strings.xml b/res/values-mcc262-mnc02-mr/strings.xml
new file mode 100644
index 0000000..d53b508
--- /dev/null
+++ b/res/values-mcc262-mnc02-mr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"वाय-फाय कॉलिंगने तुम्ही आपत्कालीन कॉल करू शकत नाही. तुम्ही आपत्कालीन कॉल करण्याचा प्रयत्न करत असल्यास, तुमचे डिव्हाइस आपोआप मोबाइल नेटवर्कचा वापर करेल. आपत्कालीन कॉल फक्त मोबाइल नेटवर्क कव्हरेज असलेल्या क्षेत्रात केले जाऊ शकतात."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ms/strings.xml b/res/values-mcc262-mnc02-ms/strings.xml
new file mode 100644
index 0000000..a0c1af5
--- /dev/null
+++ b/res/values-mcc262-mnc02-ms/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Anda tidak dapat membuat panggilan kecemasan melalui panggilan Wi-Fi. Jika anda cuba membuat panggilan kecemasan, peranti anda akan menggunakan rangkaian mudah alih secara automatik. Panggilan kecemasan hanya dapat dibuat di kawasan yang terdapat liputan rangkaian mudah alih."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-my/strings.xml b/res/values-mcc262-mnc02-my/strings.xml
new file mode 100644
index 0000000..8018dd8
--- /dev/null
+++ b/res/values-mcc262-mnc02-my/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi ခေါ်ဆိုမှုမှတစ်ဆင့် အရေးပေါ်ဖုန်းဆက်၍မရပါ။ အရေးပေါ်ဖုန်းခေါ်ဆိုမှုတစ်ခု ပြုလုပ်ရန်ကြိုးပမ်းပါက သင်၏စက်ပစ္စည်းသည် မိုဘိုင်းကွန်ရက်ကို အလိုအလျောက် အသုံးပြုပါလိမ့်မည်။ မိုဘိုင်းကွန်ရက်လိုင်းဆွဲအားရှိသော နေရာများတွင်သာ အရေးပေါ်ဖုန်းခေါ်ဆိုမှုများကိုပြုလုပ်နိုင်ပါသည်။"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-nb/strings.xml b/res/values-mcc262-mnc02-nb/strings.xml
new file mode 100644
index 0000000..7313a27
--- /dev/null
+++ b/res/values-mcc262-mnc02-nb/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Du kan ikke ringe nødnumre via Wi-Fi-anrop. Hvis du prøver å ringe et nødnummer, bruker enheten automatisk mobilnettverket. Du kan bare ringe nødnumre i områder med mobildekning."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ne/strings.xml b/res/values-mcc262-mnc02-ne/strings.xml
new file mode 100644
index 0000000..3ff5b21
--- /dev/null
+++ b/res/values-mcc262-mnc02-ne/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"तपाईं Wi-Fi को कल गर्ने सुविधामार्फत आपतकालीन कलहरू गर्न सक्नुहुन्न। तपाईंले आपतकालीन कल गर्न खोज्नुभयो भने तपाईंको यन्त्रले स्वतः मोबाइल नेटवर्कको प्रयोग गर्नेछ। मोबाइल नेटवर्क उपलब्ध भएका क्षेत्रहरूबाट मात्र आपतकालीन कलहरू गर्न सकिन्छ।"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-nl/strings.xml b/res/values-mcc262-mnc02-nl/strings.xml
new file mode 100644
index 0000000..ea4fe1c
--- /dev/null
+++ b/res/values-mcc262-mnc02-nl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Je kunt geen noodoproepen plaatsen met \'Bellen via wifi\'. Als je een noodoproep probeert te plaatsen, maakt je apparaat automatisch gebruik van het mobiele netwerk. Noodoproepen kunnen alleen worden geplaatst in gebieden met mobiele netwerkdekking."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pa/strings.xml b/res/values-mcc262-mnc02-pa/strings.xml
new file mode 100644
index 0000000..39b1080
--- /dev/null
+++ b/res/values-mcc262-mnc02-pa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ਤੁਸੀਂ Wi-Fi ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗੀ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pl/strings.xml b/res/values-mcc262-mnc02-pl/strings.xml
new file mode 100644
index 0000000..68173c9
--- /dev/null
+++ b/res/values-mcc262-mnc02-pl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Nie możesz wykonywać połączeń alarmowych przez Wi-Fi. Przy próbie wykonania takiego połączenia urządzenie automatycznie skorzysta z sieci komórkowej. Połączenia alarmowe są możliwe tylko w zasięgu sieci komórkowej."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pt-rBR/strings.xml b/res/values-mcc262-mnc02-pt-rBR/strings.xml
new file mode 100644
index 0000000..2b30ccb
--- /dev/null
+++ b/res/values-mcc262-mnc02-pt-rBR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Não é possível fazer chamadas de emergência por Wi-Fi. Se você tentar fazer isso, seu dispositivo usará automaticamente a rede móvel. Chamadas de emergência só podem ser feitas em áreas com cobertura de rede móvel."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pt-rPT/strings.xml b/res/values-mcc262-mnc02-pt-rPT/strings.xml
new file mode 100644
index 0000000..f9eef56
--- /dev/null
+++ b/res/values-mcc262-mnc02-pt-rPT/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Não pode fazer chamadas de emergência através das Chamadas Wi-Fi. Se tentar fazer uma chamada de emergência, o dispositivo utiliza automaticamente a rede móvel. Apenas é possível fazer chamadas de emergência em áreas com cobertura de rede móvel."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-pt/strings.xml b/res/values-mcc262-mnc02-pt/strings.xml
new file mode 100644
index 0000000..2b30ccb
--- /dev/null
+++ b/res/values-mcc262-mnc02-pt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Não é possível fazer chamadas de emergência por Wi-Fi. Se você tentar fazer isso, seu dispositivo usará automaticamente a rede móvel. Chamadas de emergência só podem ser feitas em áreas com cobertura de rede móvel."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ro/strings.xml b/res/values-mcc262-mnc02-ro/strings.xml
new file mode 100644
index 0000000..2a51c05
--- /dev/null
+++ b/res/values-mcc262-mnc02-ro/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Nu puteți să inițiați apeluri de urgență folosind Apelarea prin Wi-Fi. Dacă încercați să inițiați un apel de urgență, dispozitivul va folosi automat rețeaua mobilă. Apelurile de urgență pot fi inițiate numai în zonele în care funcționează rețeaua mobilă."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ru/strings.xml b/res/values-mcc262-mnc02-ru/strings.xml
new file mode 100644
index 0000000..3dc8c3c
--- /dev/null
+++ b/res/values-mcc262-mnc02-ru/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Вы не можете совершать экстренные вызовы по Wi-Fi. Для экстренного вызова устройство будет автоматически использовать мобильную сеть. Экстренные вызовы доступны только в зонах покрытия мобильной сети."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-si/strings.xml b/res/values-mcc262-mnc02-si/strings.xml
new file mode 100644
index 0000000..3d72049
--- /dev/null
+++ b/res/values-mcc262-mnc02-si/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"ඔබට Wi-Fi ඇමතීම හරහා හදිසි අවස්ථා ඇමතුම් සිදු කළ නොහැකිය. ඔබ හදිසි අවස්ථා ඇමතුමක් සිදු කිරීමට උත්සාහ ක‍ළහොත්, ඔබේ උපාංගය ස්වයංක්‍රියව ජංගම ජාලය භාවිත කරනු ඇත. හදිසි අවස්ථා ඇමතුම් ජංගම ජාල ආවරණය ඇති ප්‍රදේශවල පමණක් සිදු කළ හැකිය."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sk/strings.xml b/res/values-mcc262-mnc02-sk/strings.xml
new file mode 100644
index 0000000..c951070
--- /dev/null
+++ b/res/values-mcc262-mnc02-sk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Tiesňové volania môžete uskutočniť prostredníctvom funkcie volania cez Wi-Fi. Ak sa pokúsite uskutočniť tiesňové volanie, zariadenie automaticky použije mobilnú sieť. Tiesňové volania je možné uskutočniť iba v oblastiach s mobilným pokrytím."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sl/strings.xml b/res/values-mcc262-mnc02-sl/strings.xml
new file mode 100644
index 0000000..42e3137
--- /dev/null
+++ b/res/values-mcc262-mnc02-sl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Klicanje v sili prek Wi-Fi-ja ni mogoče. Če poskusite opraviti klic v sili, bo naprava samodejno uporabila mobilno omrežje. Klice v sili lahko opravite samo na območjih s signalom mobilnega omrežja."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sq/strings.xml b/res/values-mcc262-mnc02-sq/strings.xml
new file mode 100644
index 0000000..80fa491
--- /dev/null
+++ b/res/values-mcc262-mnc02-sq/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Nuk mund të kryesh telefonata urgjence përmes telefonatave me Wi-Fi. Nëse përpiqesh të kryesh një telefonatë urgjence, pajisja do të përdorë automatikisht rrjetin celular. Telefonatat e urgjencës mund të kryhen vetëm në zona që kanë mbulim me rrjet celular."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sr/strings.xml b/res/values-mcc262-mnc02-sr/strings.xml
new file mode 100644
index 0000000..0d67699
--- /dev/null
+++ b/res/values-mcc262-mnc02-sr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Не можете да упућујете хитне позиве помоћу позивања преко Wi-Fi-ја. Ако пробате да упутите хитан позив, уређај ће аутоматски користити мобилну мрежу. Хитни позиви могу да се упућују само у областима покривеним мобилном мрежом."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sv/strings.xml b/res/values-mcc262-mnc02-sv/strings.xml
new file mode 100644
index 0000000..82848f8
--- /dev/null
+++ b/res/values-mcc262-mnc02-sv/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Det går inte att ringa nödsamtal via Wi-Fi. Om du ringer ett nödnummer på enheten används mobilnätverket automatiskt. Det går bara att ringa nödsamtal där mobilnätet har täckning."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-sw/strings.xml b/res/values-mcc262-mnc02-sw/strings.xml
new file mode 100644
index 0000000..5c98759
--- /dev/null
+++ b/res/values-mcc262-mnc02-sw/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Huwezi kupiga simu za dharura ukitumia huduma ya Kupiga simu kupitia Wi-Fi. Ukijaribu kupiga simu za dharura, kifaa chako kitatumia mtandao wa simu kiotomatiki. Unaweza tu kupiga simu za dharura katika sehemu ambapo mtandao wa simu unapatikana."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ta/strings.xml b/res/values-mcc262-mnc02-ta/strings.xml
new file mode 100644
index 0000000..168b3bf
--- /dev/null
+++ b/res/values-mcc262-mnc02-ta/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"வைஃபை அழைப்பு மூலம் அவசர அழைப்புகளைச் செய்ய முடியாது. அவசர அழைப்பைச் செய்ய முயன்றால், உங்கள் சாதனம் தானாகவே மொபைல் நெட்வொர்க்கைப் பயன்படுத்தும். மொபைல் நெட்வொர்க் கவரேஜ் உள்ள பகுதிகளில் மட்டுமே அவசர அழைப்புகளைச் செய்ய முடியும்."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-te/strings.xml b/res/values-mcc262-mnc02-te/strings.xml
new file mode 100644
index 0000000..ca0786e
--- /dev/null
+++ b/res/values-mcc262-mnc02-te/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"మీరు Wi-Fi కాలింగ్ ద్వారా అత్యవసర కాల్‌లను చేయలేరు. అత్యవసర కాల్ చేయడానికి ప్రయత్నిస్తే, మీ పరికరం స్వయంచాలకంగా మొబైల్ నెట్‌వర్క్‌ని ఉపయోగిస్తుంది. మొబైల్ నెట్‌వర్క్‌ కవరేజ్ ఉన్న ప్రాంతాల్లో మాత్రమే అత్యవసర కాల్‌లు చేయబడతాయి."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-th/strings.xml b/res/values-mcc262-mnc02-th/strings.xml
new file mode 100644
index 0000000..3128bfe
--- /dev/null
+++ b/res/values-mcc262-mnc02-th/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"คุณไม่สามารถโทรฉุกเฉินด้วยการโทรผ่าน Wi-Fi หากคุณพยายามโทรฉุกเฉิน อุปกรณ์จะใช้เครือข่ายมือถือโดยอัตโนมัติ การโทรฉุกเฉินสามารถใช้งานได้ในบริเวณที่มีสัญญาณเครือข่ายมือถือเท่านั้น"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-tl/strings.xml b/res/values-mcc262-mnc02-tl/strings.xml
new file mode 100644
index 0000000..4671d66
--- /dev/null
+++ b/res/values-mcc262-mnc02-tl/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Hindi ka makakapagsagawa ng mga emergency na tawag sa pamamagitan ng pagtawag gamit ang Wi-Fi. Kung susubukan mong magsagawa ng emergency na tawag, awtomatikong gagamitin ng iyong device ang mobile network. Makakapagsagawa lang ng mga emergency na tawag sa mga lugar na nasasaklawan ng mobile network."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-tr/strings.xml b/res/values-mcc262-mnc02-tr/strings.xml
new file mode 100644
index 0000000..9fe9d25
--- /dev/null
+++ b/res/values-mcc262-mnc02-tr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Kablosuz çağrı ile acil durum aramaları yapamazsınız. Acil durum araması yapmaya çalışırsanız cihazınız otomatik olarak mobil ağa geçecektir. Acil durum aramaları yalnızca mobil ağ kapsamında olan yerlerden yapılabilir."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-uk/strings.xml b/res/values-mcc262-mnc02-uk/strings.xml
new file mode 100644
index 0000000..1cf0381
--- /dev/null
+++ b/res/values-mcc262-mnc02-uk/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ви не можете здійснювати екстрені виклики через Wi-Fi. Якщо ви спробуєте здійснити екстрений виклик, пристрій автоматично використовуватиме мобільну мережу. Екстрені виклики доступні лише в місцевостях із мобільним покриттям."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-ur/strings.xml b/res/values-mcc262-mnc02-ur/strings.xml
new file mode 100644
index 0000000..c1cee4d
--- /dev/null
+++ b/res/values-mcc262-mnc02-ur/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">"‏\n\nآپ Wi-Fi کالنگ کے ذریعے ایمرجنسی کالز نہیں کر سکتے۔ اگر آپ کوئی ایمرجنسی کال کرنے کی کوشش کرتے ہیں، تو آپ کا آلہ خودکار طور پر موبائل نیٹ ورک کا استعمال کرے گا۔ ایمرجنسی کللز صرف موبائل نیٹ ورک کوریج کے ساتھ ہی کی جا سکتی ہیں۔"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-uz/strings.xml b/res/values-mcc262-mnc02-uz/strings.xml
new file mode 100644
index 0000000..5e1b59e
--- /dev/null
+++ b/res/values-mcc262-mnc02-uz/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi chaqiruv orqali favqulodda chaqiruvlarni amalga oshirib bo‘lmaydi. Agar favqulodda chaqirishni boshlasangiz, qurilmangiz avtomatik ravishda mobil tarmoqdan foydalanadi. Favqulodda chaqiruvlar faqat mobil tarmoq doirasidagina ishlaydi."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-vi/strings.xml b/res/values-mcc262-mnc02-vi/strings.xml
new file mode 100644
index 0000000..126bc50
--- /dev/null
+++ b/res/values-mcc262-mnc02-vi/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Bạn không thể thực hiện cuộc gọi khẩn cấp thông qua tính năng Gọi qua Wi-Fi. Nếu bạn cố gắng thực hiện cuộc gọi khẩn cấp, thiết bị của bạn sẽ tự động sử dụng mạng di động. Chỉ có thể thực hiện cuộc gọi khẩn cấp ở những khu vực có phủ sóng mạng di động."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-zh-rCN/strings.xml b/res/values-mcc262-mnc02-zh-rCN/strings.xml
new file mode 100644
index 0000000..b2967b6
--- /dev/null
+++ b/res/values-mcc262-mnc02-zh-rCN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"您无法通过 WLAN 通话功能拨打紧急呼救电话。如果您尝试拨打紧急呼救电话，您的设备将自动使用移动网络。您只能在有移动网络的地方拨打紧急呼救电话。"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-zh-rHK/strings.xml b/res/values-mcc262-mnc02-zh-rHK/strings.xml
new file mode 100644
index 0000000..22d5c0d
--- /dev/null
+++ b/res/values-mcc262-mnc02-zh-rHK/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"您不可透過 Wi-Fi 通話撥打緊急電話。如果您嘗試撥打緊急電話，裝置會自動使用流動網絡。您只可在有流動網絡覆蓋的地方撥打緊急電話。"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-zh-rTW/strings.xml b/res/values-mcc262-mnc02-zh-rTW/strings.xml
new file mode 100644
index 0000000..9e6b3a5
--- /dev/null
+++ b/res/values-mcc262-mnc02-zh-rTW/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Wi-Fi 通話功能無法用來撥打緊急電話。如果你嘗試撥打緊急電話，裝置將自動使用行動網路。在行動網路覆蓋的區域中才能撥打緊急電話。"</string>
+</resources>
diff --git a/res/values-mcc262-mnc02-zu/strings.xml b/res/values-mcc262-mnc02-zu/strings.xml
new file mode 100644
index 0000000..3c2dfba
--- /dev/null
+++ b/res/values-mcc262-mnc02-zu/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n"Ungenza amakholi aphuthumayo ngokushaya kwe-Wi-Fi. Uma uzama ukwenza ikholi ephuthumayo, idivayisi yakho izosebenzisa ngokuzenzakalela inethiwekhi yeselula. Amakholi aphuthumayo angenziwa kuphela ezindaweni ezinenethiweki yeselula."</string>
+</resources>
diff --git a/res/values-mcc262-mnc02/strings.xml b/res/values-mcc262-mnc02/strings.xml
new file mode 100644
index 0000000..280f59e
--- /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 6f1a4f4..1f76012 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добар"</item>
     <item msgid="8986346415847956850">"Одличен"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Секогаш"</item>
-    <item msgid="844721238536786870">"Само кога е вклучено"</item>
-    <item msgid="1986753720941888596">"Никогаш"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Секогаш"</item>
-    <item msgid="7433294150916905997">"Само кога е вклучено"</item>
-    <item msgid="1390404486722375028">"Никогаш"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Последните 30 дена"</item>
     <item msgid="6600989128423965319">"Пост. цикл. на корист...."</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4052103..17ddabc 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -23,13 +23,13 @@
     <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="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="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 +41,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 +107,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">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> е видлив за уредите во близина кога се отворени Поставки за Bluetooth."</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>
@@ -121,7 +138,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">"Допрете за да се спари со <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>
@@ -157,6 +175,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) -->
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Сметки"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Сметки"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Безбедност и локација"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрирање и акредитиви"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефонот е шифриран"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Уредот е шифриран"</string>
@@ -354,40 +378,55 @@
     <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>
@@ -449,6 +488,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 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Смени шема на отклуч."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промени PIN за отклучување"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Смени лозинка за откл."</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Обиди се повторно. Обид <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> од <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Последен обид"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Работниот профил и податоците во врска со него ќе бидат отстранети од уредот ако и при овој обид внесете погрешна работна шема."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Работниот профил и податоците во врска со него ќе бидат отстранети од уредот ако и при овој обид внесете погрешен работен PIN."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Работниот профил и податоците во врска со него ќе бидат отстранети од уредот ако и при овој обид внесете погрешна работна лозинка."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Премногу погрешни обиди. Работниот профил и податоците во врска со него ќе бидат отстранети од уредот."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Отфрли"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Обидете се повторно. Обид <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> од <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Податоците ќе се избришат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ако впишете погрешна шема при следниот обид, податоците на уредов ќе се избришат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ако впишете погрешен PIN при следниот обид, податоците на уредов ќе се избришат"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ако впишете погрешна лозинка при следниот обид, податоците на уредов ќе се избришат"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ако впишете погрешна шема при следниот обид, корисников ќе се избрише"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ако впишете погрешен PIN при следниот обид, корисников ќе се избрише"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ако впишете погрешна лозинка при следниот обид, корисников ќе се избрише"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ако впишете погрешна шема при следниот обид, работниот профил и неговите податоци ќе се избришат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ако впишете погрешен PIN при следниот обид, работниот профил и неговите податоци ќе се избришат"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ако впишете погрешна лозинка при следниот обид, работниот профил и неговите податоци ќе се избришат"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Премногу погрешни обиди. Податоците на уредов ќе се избришат."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Премногу погрешни обиди. Корисникот ќе се избрише."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Премногу погрешни обиди. Работниот профил и неговите податоци ќе се избришат."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Отфрли"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Мора да има најмалку <xliff:g id="COUNT">%d</xliff:g> знаци"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-от мора да има најмалку <xliff:g id="COUNT">%d</xliff:g> цифри"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продолжи"</string>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +812,6 @@
     <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_ssid" msgid="5519636102673067319">"Име на мрежа"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Внеси SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безбедност"</string>
@@ -810,7 +874,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>
@@ -847,9 +910,28 @@
     <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>
+    <!-- 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_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">"Вклучување точка на пристап..."</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 +978,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>
@@ -980,23 +1063,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1113,19 @@
     <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>
+    <!-- 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">"Секогаш вклученa"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Прикажување на времето, икони за известување и други информации"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Големина на фонт"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Намалете го или зголемете го текстот"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Поставки на заклучување на SIM картичка"</string>
@@ -1080,8 +1184,8 @@
     <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" 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">"Одмонтирај СД картичка, прикажи расположлива меморија"</string>
@@ -1105,7 +1209,7 @@
     <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="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>
@@ -1171,7 +1275,7 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"Овозможува апликациите со овозможен MIDI да работат преку USB со софтвер MIDI на компјутерот."</string>
     <string name="storage_other_users" msgid="808708845102611856">"Други корисници"</string>
-    <string name="storage_internal_title" msgid="690771193137801021">"Капацитет на уредот"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"Меморија на уредот"</string>
     <string name="storage_external_title" msgid="3433462910096848696">"Пренослива меморија"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> искористено од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
@@ -1206,9 +1310,9 @@
     <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_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>
@@ -1273,6 +1377,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN не може да биде празна."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Полето MNC мора да биде 3 цифри."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Полето MNC мора да биде 2 или 3 бројни места."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Операторот не дозволува додавање APN од типот %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Враќање стандардни подесувања на APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Ресетирај на стандардни вредности"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ресетирањето стандардни подесувања на APN е завршено."</string>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Избриши СД картичка"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Избриши ги сите податоци во внатрешната USB меморија, како што се музика или фотографии"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Избриши ги сите податоци на СД картичката, како што се музика или фотографии"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Избриши ги eSIM-картичките"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Избришете ги сите eSIM-картички на телефонот. Тоа ќе го откаже вашиот план за мобилна услуга."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Избришете ги сите eSIM-картички на таблетот.Тоа ќе го откаже вашиот план за мобилна услуга."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Ресетирај таблет"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ресетирај телефон"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Да се избришат сите ваши лични податоци и преземени апликации? Не може да го вратите ова дејство!"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,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>
@@ -1491,12 +1593,18 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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="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>
@@ -1550,11 +1658,12 @@
     <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="default" msgid="1477351142334784771">"На СД картичка"</string>
+    <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="internal_storage" msgid="1584700623164275282">"Внатрешен капацитет"</string>
-    <string name="internal_storage_sentence" msgid="889098931914857143">"внатрешен капацитет"</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">"СД мемо картич."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Повторно пресметување големина..."</string>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Помош при внесување"</string>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"Вкупно CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Преден план на CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Задржи активен"</string>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- 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>
@@ -2654,17 +2815,20 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"мобилна мрежа, мобилен, мобилен оператор, безжичен, податоци, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2873,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>
@@ -2833,8 +3003,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>
@@ -2965,11 +3133,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 +3140,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Може дополнително да го заштитите уредот ако ја бара лозинката пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако бара ПИН пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара лозинката пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Освен користењето на отпечатокот за отклучување на уредот, може дополнително да го заштитите ако бара лозинка пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, вклучувајќи и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Барајте PIN?"</string>
@@ -2997,14 +3160,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="SIZE">%1$s</xliff:g> употребени во <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
-    <string name="storage_type_internal" msgid="6042049833565674948">"Внатрешен капацитет"</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="SIZE">%1$s</xliff:g> користени од <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> користено од <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"Искористена меморија"</string>
     <string name="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_0">%1$d</xliff:g> од <xliff:g id="COUNT_1">%2$d</xliff:g> категории се исклучени"</string>
@@ -3093,8 +3256,14 @@
     <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>
+    <!-- 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>
@@ -3187,8 +3356,9 @@
     <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="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>
@@ -3200,8 +3370,6 @@
     <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_switch_title" msgid="3621381992793251070">"Дозволете од изворов"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Завртете двапати за камерата"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Завртете го зглобот двапати за да ја отворите апликација за камера"</string>
@@ -3234,7 +3402,7 @@
     <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="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>
@@ -3296,8 +3464,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 +3484,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>
@@ -3369,7 +3536,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="one"><xliff:g id="COUNT">%d</xliff:g> апликација може да користи неограничен интернет</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> апликации може да користат неограничен интернет</item>
@@ -3382,7 +3549,6 @@
     <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_warning" msgid="9086859595338944882">"Премиум SMS може да ве чини пари, а сумата ќе се додаде на сметките од операторот. Ако овозможите дозвола за апликацијата, ќе може да испраќате премиум SMS со неа."</string>
@@ -3447,28 +3613,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-ml/arrays.xml b/res/values-ml/arrays.xml
index 428a516..85d818f 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"നല്ലത്"</item>
     <item msgid="8986346415847956850">"മികച്ചത്"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"എല്ലായ്പ്പോഴും"</item>
-    <item msgid="844721238536786870">"പ്ലഗ്ഗുചെയ്‌തിരിക്കവേ"</item>
-    <item msgid="1986753720941888596">"ഒരിക്കലും"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"എല്ലായ്പ്പോഴും"</item>
-    <item msgid="7433294150916905997">"പ്ലഗ്ഗുചെയ്‌തിരിക്കവേ"</item>
-    <item msgid="1390404486722375028">"ഒരിക്കലും"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"കഴിഞ്ഞ 30 ദിവസം"</item>
     <item msgid="6600989128423965319">"ഉപയോഗ സൈക്കിൾ സജ്ജമാക്കുക..."</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index cdca36b..4b0ffbc 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -23,13 +23,13 @@
     <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="other">ഒരു ഡവലപ്പറാകുന്നതിൽ നിന്നും നിങ്ങൾ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ചുവട് മാത്രം അകലെയാണ്.</item>
       <item quantity="one">ഒരു ഡവലപ്പറാകുന്നതിൽ നിന്നും നിങ്ങൾ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ചുവട് മാത്രം അകലെയാണ്.</item>
     </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 +41,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 +107,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">"ബ്ലൂടൂത്ത് ക്രമീകരണങ്ങൾ മാറ്റാൻ നിങ്ങൾക്ക് അനുമതിയില്ല."</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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) -->
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"അക്കൗണ്ടുകൾ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ലൊക്കേഷൻ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"അക്കൗണ്ടുകൾ"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"സുരക്ഷയും ലൊക്കേഷനും"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"എൻക്രിപ്‌ഷനും ക്രെഡന്‍ഷ്യലുകളും"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ഫോൺ എൻക്രിപ്‌റ്റ് ചെയ്‌തു"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ഉപകരണം എൻക്രിപ്റ്റ് ചെയ്തു"</string>
@@ -354,40 +378,55 @@
     <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>
+    <!-- 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>
@@ -449,6 +488,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 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"അൺലോക്ക് പാറ്റേൺ മാറ്റുക"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"അൺലോക്ക് പിൻ മാറ്റുക"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"അൺലോക്ക് പാസ്‌വേഡ് മാറ്റുക"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"വീണ്ടും ശ്രമിക്കുക. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ശ്രമം."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"അവസാന ശ്രമം"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ഈ ശ്രമത്തിൽ നിങ്ങൾ തെറ്റായ ഔദ്യോഗിക പാറ്റേണാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ഈ ശ്രമത്തിൽ നിങ്ങൾ തെറ്റായ ഔദ്യോഗിക പിൻ ആണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ഈ ശ്രമത്തിൽ നിങ്ങൾ തെറ്റായ ഔദ്യോഗിക പാസ്‌വേഡാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ഡിസ്മിസ് ചെയ്യുക"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"വീണ്ടും ശ്രമിക്കുക. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ശ്രമം."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"നിങ്ങളുടെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാറ്റേണാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പിന്നാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാസ്‌വേഡാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാറ്റേണാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപയോക്താവ് ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പിന്നാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപയോക്താവ് ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാസ്‌വേഡാണ് നൽകുന്നതെങ്കിൽ, ഈ ഉപയോക്താവ് ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാറ്റേണാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും അതിന്റെ ഡാറ്റയും ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പിന്നാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും അതിന്റെ ഡാറ്റയും ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായൊരു പാസ്‌വേഡാണ് നൽകുന്നതെങ്കിൽ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും അതിന്റെ ഡാറ്റയും ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. ഈ ഉപയോക്താവ് ഇല്ലാതാക്കപ്പെടും."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. ഈ ഔദ്യോഗിക പ്രൊഫൈലും അതിന്റെ ഡാറ്റയും ഇല്ലാതാക്കപ്പെടും."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"നിരസിക്കുക"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> പ്രതീകങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"പിൻ നമ്പറിൽ കുറഞ്ഞത് <xliff:g id="COUNT">%d</xliff:g> അക്കങ്ങളെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"തുടരുക"</string>
@@ -578,8 +627,8 @@
     <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>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +812,6 @@
     <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">"വൈഫൈ വിച്ഛേദിച്ചു. 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>
@@ -810,7 +874,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 +910,28 @@
     <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>
+    <!-- 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_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">"ഹോട്ട്‌സ്പോട്ട് ഓണാക്കുന്നു…"</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 +978,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,10 +1036,10 @@
     <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="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,23 +1063,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1113,19 @@
     <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>
+    <!-- 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">"സിം കാർഡ് ലോക്ക് ക്രമീകരണങ്ങൾ"</string>
@@ -1273,6 +1377,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ശൂന്യമായിരിക്കരുത്."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ഫീൽഡിൽ 3 സംഖ്യകൾ ഉണ്ടായിരിക്കണം."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ഫീൽഡിൽ 2 അല്ലെങ്കിൽ 3 സംഖ്യകൾ ഉണ്ടായിരിക്കണം."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"%s തരത്തിലുള്ള APN-കൾ ചേർക്കുന്നത് കാരിയർ അനുവദിക്കുന്നില്ല."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"സ്ഥിര APN ക്രമീകരണങ്ങൾ പുനഃസ്ഥാപിക്കുന്നു"</string>
     <string name="menu_restore" msgid="8260067415075573273">"സ്ഥിരമായതിലേക്ക് പുനഃസജ്ജമാക്കുക"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"സ്ഥിര APN ക്രമീകരണങ്ങൾ പുനഃസജ്ജീകരിക്കൽ പൂർത്തിയാക്കി."</string>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD കാർഡ് മായ്ക്കുക"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ആന്തരിക USB സംഭരണത്തിലെ സംഗീതമോ ഫോട്ടോകളോ പോലുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"സംഗീതമോ ഫോട്ടോകളോ പോലുള്ള, SD കാർഡിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs മായ്‌ക്കുക"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ഫോണിലെ എല്ലാ eSIM-കളും മായ്‌ക്കുക. ഇത് നിങ്ങളുടെ മൊബൈൽ സേവന പ്ലാൻ റദ്ദാക്കുകയില്ല."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ടാബ്‌ലെറ്റിലെ എല്ലാ eSIM-കളും മായ്‌ക്കുക. ഇത് നിങ്ങളുടെ മൊബൈൽ സേവന പ്ലാൻ റദ്ദാക്കുകയില്ല."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ടാബ്‌ലെറ്റ് പുനഃസജ്ജമാക്കുക"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ഫോൺ പുനഃസജ്ജമാക്കുക"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഡൗൺലോഡ് ചെയ്‌ത അപ്ലിക്കേഷനുകളും മായ്‌ക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല!"</string>
@@ -1312,7 +1420,7 @@
     <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">"ബ്ലൂടൂത്ത് ടെതറിംഗ്"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1373,10 +1475,10 @@
     <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_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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1658,7 @@
     <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="default" msgid="1477351142334784771">"SD കാർഡിൽ"</string>
+    <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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ഇൻപുട്ട് സഹായം"</string>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"മൊത്തം CPU ഉപയോഗം"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ഫോർഗ്രൗണ്ട്"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"സജീവമായി തുടരുക"</string>
@@ -1989,7 +2148,7 @@
     <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_sugg_display" msgid="3370202402045141760">"സ്‌ക്രീൻ തെളിച്ചം കൂടാതെ/അല്ലെങ്കിൽ സ്‌ക്രീൻ കാലഹരണപ്പെടൽ കുറയ്ക്കുക"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi‑Fi-യുടെ ബാറ്ററി ഉപഭോഗം"</string>
     <string name="battery_sugg_wifi" msgid="7776093125855397043">"വൈഫൈ ഉപയോഗിക്കാതിരിക്കുമ്പോഴോ ലഭ്യമല്ലെങ്കിലോ അത് ഓഫാക്കുക"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ബ്ലൂടൂത്തിന്റെ ബാറ്ററി ഉപഭോഗം"</string>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2027,7 +2188,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"മീഡിയ സെർവർ"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ആപ്പ് ഓപ്റ്റിമൈസേഷന്‍"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"ബാറ്ററി ലാഭിക്കൽ"</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_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> ബാറ്ററിയിൽ"</string>
@@ -2654,9 +2815,12 @@
       <item quantity="one">മറച്ച %d ഇനം കാണിക്കുക</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"നെറ്റ്‌വർക്കും ഇന്റർനെറ്റും"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"വൈ-ഫൈ, മൊബൈൽ, ഡാറ്റ ഉപഭോഗം, ഹോട്ട്‌സ്‌പോട്ട്"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"മൊബൈല്‍"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ഡാറ്റ ഉപയോഗം"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ഹോട്ട്‌സ്‌പോട്ട്"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"കണക്‌റ്റുചെയ്ത ഉപകരണം"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, കാസ്റ്റ്, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, കാസ്‌റ്റ്"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ആപ്‌സും അറിയിപ്പുകളും"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"അനുമതികൾ, ‌ഡിഫോൾട്ട് ആപ്പുകൾ"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ഉപയോക്താക്കളും അക്കൗണ്ടും"</string>
@@ -2664,7 +2828,7 @@
     <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="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_mobile_networks" msgid="8995946622054642367">"സെല്ലുലാർ, മൊബൈൽ, സെൽ കാരിയർ, വയർലെസ്, ഡാറ്റ, 4g,3g, 2g, lte"</string>
@@ -2693,7 +2857,7 @@
     <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>
@@ -2706,9 +2870,15 @@
     <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="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">"വൈഫൈ NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"റൈറ്റുചെയ്യാൻ ഒരു ടാഗ് ടാപ്പുചെയ്യുക..."</string>
@@ -2833,8 +3003,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>
@@ -2965,11 +3133,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 +3140,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>
@@ -3063,7 +3226,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>
@@ -3095,6 +3258,12 @@
     <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>
+    <!-- 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>
@@ -3139,7 +3308,7 @@
     <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_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>
@@ -3187,8 +3356,9 @@
     <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="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>
@@ -3200,8 +3370,6 @@
     <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_switch_title" msgid="3621381992793251070">"ഈ ഉറവിടത്തിൽ നിന്ന് അനുവദിക്കുക"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"ക്യാമറയ്ക്കായി രണ്ടുതവണ തിരിക്കുക"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"നിങ്ങളുടെ കൈത്തണ്ട രണ്ടുപ്രാവശ്യം തിരിച്ചുകൊണ്ട് ക്യാമറാ ആപ്പ് തുറക്കുക"</string>
@@ -3234,7 +3402,7 @@
     <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="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>
@@ -3266,7 +3434,7 @@
     <string name="condition_airplane_title" msgid="287356299107070503">"വിമാന മോഡ് ഓണാണ്"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"വൈഫൈ, Bluetooth, മൊബൈൽ നെറ്റ്‌വർക്ക് എന്നിവ ഓഫാക്കിയിരിക്കുന്നു. നിങ്ങൾക്ക് കോൾ ചെയ്യാനോ ഇന്റർനെറ്റിലേക്ക് കണക്റ്റുചെയ്യാനോ കഴിയില്ല."</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_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">"വൈഫൈ വഴി മാത്രം ഇന്റർനെറ്റ് ലഭ്യമാണ്"</string>
@@ -3296,8 +3464,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 +3484,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>
@@ -3358,7 +3525,7 @@
     <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_parcel" msgid="243148037601903212">"പാഴ്‌സൽ വലുപ്പം"</string>
@@ -3382,7 +3549,6 @@
     <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_warning" msgid="9086859595338944882">"പ്രീമിയം SMS-ന് നിങ്ങൾ പണം നൽകേണ്ടി വന്നേക്കാം, കാരിയറുടെ ബില്ലിലേക്ക് ഈ തുക ചേർക്കുന്നതാണ്. നിങ്ങളൊരു ആപ്പിന് അനുമതി പ്രവർത്തനക്ഷമമാക്കുന്നുവെങ്കിൽ, ആ ആപ്പ് ഉപയോഗിച്ച് പ്രീമിയം SMS അയയ്ക്കാനാകും."</string>
@@ -3447,29 +3613,56 @@
     <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>
+    <!-- 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>
+    <!-- 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 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>
-    <string name="assist_gesture_title" msgid="7746563137898655539">"വിരൽചലിത സഹായി"</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>
     <string name="gesture_setting_on" msgid="3455094265233870280">"ഓൺ"</string>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-mn/arrays.xml b/res/values-mn/arrays.xml
index 32550f5..039d16a 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Сайн"</item>
     <item msgid="8986346415847956850">"Маш сайн"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Байнга"</item>
-    <item msgid="844721238536786870">"Зөвхөн залгасан үед"</item>
-    <item msgid="1986753720941888596">"Хэзээ ч үгүй"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Байнга"</item>
-    <item msgid="7433294150916905997">"Зөвхөн залгасан үед"</item>
-    <item msgid="1390404486722375028">"Хэзээ ч үгүй"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Сүүлийн 30 өдөр"</item>
     <item msgid="6600989128423965319">"Ашиглалтын циклийг тохируулах..."</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index b1aeac3..56dcb79 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -23,13 +23,13 @@
     <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="other">Танд одоо хөгжүүлэгч болоход <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> алхам дутуу байна.</item>
       <item quantity="one">Танд одоо хөгжүүлэгч болоход <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> алхам дутуу байна.</item>
     </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 +41,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 +107,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">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> нь Bluetooth асаалттай үед ойрхон байгаа бусад төхөөрөмжүүдэд харагдана."</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>
@@ -121,7 +138,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">"<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>
@@ -157,6 +175,11 @@
     <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>
+    <!-- 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">"Огноо &amp; цаг"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Цагийн бүсийг сонгоно уу"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
+    <!-- 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">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ т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>
+    <!-- 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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Тайлах хээг өөрчлөх"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Тайлах PIN өөрчлөх"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Тайлах нууц үгийг өөрчлөх"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Дахин оролдоно уу. Оролдого <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-н <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Сүүлийн оролдлого"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Хэрэв та энэ оролдлогоор ажлын зурган түгжээг буруу оруулвал, таны ажлын профайл болон үүнтэй холбогдох өгөгдөл энэ төхөөрөмжөөс устах болно."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Хэрэв та энэ оролдлогоор ажлын PIN-г буруу оруулвал, таны ажлын профайл болон үүнтэй холбогдох өгөгдөл энэ төхөөрөмжөөс устах болно."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Хэрэв та энэ оролдлогоор ажлын нууц үгээ буруу оруулвал, таны ажлын профайл болон үүнтэй холбогдох өгөгдөл энэ төхөөрөмжөөс устах болно."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Хэт олон удаагийн буруу оролдлого. Таны ажлын профайл болон үүнтэй холбогдох өгөгдөл энэ төхөөрөмжөөс устах болно."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Хаах"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Дахин оролдоно уу. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>-с <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> оролдлого үлдсэн байна."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Таны өгөгдлийг устгах болно"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Та дараагийн оролдлогоор буруу загвар оруулбал энэ төхөөрөмжийн өгөгдлийг устгах болно"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Та дараагийн оролдлогоор буруу ПИН оруулбал энэ төхөөрөмжийн өгөгдлийг устгах болно"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Та дараагийн оролдлогоор буруу нууц үг оруулбал энэ төхөөрөмжийн өгөгдлийг устгах болно"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Та дараагийн оролдлогоор буруу загвар оруулбал энэ хэрэглэгчийг устгах болно"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Та дараагийн оролдлогоор буруу ПИН оруулбал энэ хэрэглэгчийг устгах болно"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Та дараагийн оролдлогоор буруу нууц үг оруулбал энэ хэрэглэгчийг устгах болно"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Та дараагийн оролдлогоор буруу загвар оруулбал таны ажлын профайлыг үүний өгөгдлийн хамтаар устгах болно"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Та дараагийн оролдлогоор буруу ПИН оруулбал таны ажлын профайлыг үүний өгөгдлийн хамтаар устгах болно"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Та дараагийн оролдлогоор буруу нууц үг оруулбал таны ажлын профайлыг үүний өгөгдлийн хамтаар устгах болно"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Түгжээг хэт олон удаа буруу оруулсан тул энэ төхөөрөмжийн өгөгдлийг устгах болно."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Түгжээг хэт олон удаа буруу оруулсан тул энэ хэрэглэгчийг устгах болно."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Түгжээг хэт олон удаа буруу оруулсан тул энэ ажлын профайлыг үүний өгөгдлийн хамтаар устгах болно."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Хаах"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Хамгийн багадаа <xliff:g id="COUNT">%d</xliff:g> тэмдэгт байх шаардлагатай"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ПИН хамгийн багадаа <xliff:g id="COUNT">%d</xliff:g> цифртэй байх шаардлагатай"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Үргэлжлүүлэх"</string>
@@ -626,6 +674,22 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth дэлгэрэнгүй"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetoothийг идэвхжүүлсэн үед таны төхөөрөмж ойролцоо байгаа Bluetooth төхөөрөмжүүдтэй холбогдох боломжтой болно."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Байршлын нарийвчлалыг сайжруулахын тулд системийн апп болон үйлчилгээ нь Bluetooth төхөөрөмжийг илрүүлэх боломжтой. Ta үүнийг <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Хайлт хийх тохиргоо<xliff:g id="LINK_END_1">LINK_END</xliff:g> дотроос өөрчилж болно."</string>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"Сүлжээний нэр"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID оруулна уу"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Аюулгүй байдал"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"Сүлжээний цэгийг асааж байна…"</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN хоосон байж болохгүй."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC талбар 3 цифртэй байх ёстой."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC талбар 2 буюу 3 цифртэй байх ёстой."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Оператор компани нь %s төрлийн APN нэмэхийг зөвшөөрдөггүй."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Үндсэн APN тохиргоог сэргээж байна"</string>
     <string name="menu_restore" msgid="8260067415075573273">"Үндсэн рүү сэргээх"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Үндсэн APN тохиргоог дахин шинэчилж дууслаа."</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD картыг арилгах"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Дотоод USB сан дээрх хөгжим буюу зураг гэх мэт бүх өгөгдлийг арилгах"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD карт дээрх хөгжим, зураг гэх мэт бүх өгөгдлүүдийг арчих"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs-г устгах"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Утасны бүх eSIMs-г устгана уу. Энэ нь таны мобайл үйлчилгээний төлөвлөгөөг цуцлахгүй."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Таблетын бүх eSIMs-г устгана уу. Энэ нь таны мобайл үйлчилгээний төлөвлөгөөг цуцлахгүй."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Таблетыг дахин шинэчлэх"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Утсыг дахин шинэчлэх"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Бүх хувийн мэдээллээ устгаад, аппыг татаж авмаар байна уу? Энэ үйлдлийг буцаах боломжгүй!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SD карт дээр"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Оролтын дэмжлэг"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"CPU нийт"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ил"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Сэрүүн байлгах"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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="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>
@@ -2654,17 +2814,20 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"үүрэн холбоо, үүрэн холбооны оператор, утасгүй интернэт, дата, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,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 Tагь тохируулах"</string>
     <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Бичихийн тулд тагь дээр дарах ..."</string>
@@ -2825,14 +2994,12 @@
     <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_empty_text" msgid="685224245260197779">"Дэлгэцэн доторх дэлгэцийг дэмждэг суулгасан апп алга"</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_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="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="manage_zen_access_title" msgid="2611116122628520522">"\"Бүү саад бол\" хандалт"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Суулгасан апп-аас \"Бүү саад бол\" хандалтыг хүссэн апп байхгүй байна."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
@@ -2903,7 +3070,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>
@@ -2963,11 +3130,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 +3137,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 +3255,12 @@
     <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>
+    <!-- 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>
@@ -3101,7 +3269,7 @@
     <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Та үүнийг дараа нь Тохиргоо, Апп, мэдэгдэл хэсэгт өөрчлөх боломжтой."</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="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 Tuner харуулах"</string>
@@ -3185,8 +3353,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="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>
@@ -3198,8 +3367,6 @@
     <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_switch_title" msgid="3621381992793251070">"Энэ эх сурвалжаас зөвшөөрөх"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Камер нээхийн тулд бугуйгаа 2 удаа эргүүлэх"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Бугуйгаа 2 удаа эргүүлэн камерын аппыг нээгээрэй"</string>
@@ -3294,8 +3461,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>
@@ -3315,7 +3481,7 @@
       <item quantity="one">1 апп нь өгөгдөл хамгаалагчийг асаалттай үед хязгаарлагдаагүй өгөгдлийг ашиглах боломжтой</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Өгөгдөл хамгаалагч"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Хязгаарлагдаагүй өгөгдлийн хандалт"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Хязгаарлалтгүй дата"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Арын дата унтарсан байна"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Идэвхтэй"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Идэвхгүй"</string>
@@ -3380,11 +3546,10 @@
     <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_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>
@@ -3445,28 +3610,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3570,6 +3762,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 +3776,10 @@
     <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>
+    <!-- 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-mr/arrays.xml b/res/values-mr/arrays.xml
index d7d49c0..3940dab 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"उत्तम"</item>
     <item msgid="8986346415847956850">"उत्कृष्ट"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"नेहमी"</item>
-    <item msgid="844721238536786870">"फक्त प्लग इन केलेले असते तेव्हा"</item>
-    <item msgid="1986753720941888596">"कधीही नाही"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"नेहमी"</item>
-    <item msgid="7433294150916905997">"फक्त प्लग इन केलेले असते तेव्हा"</item>
-    <item msgid="1390404486722375028">"कधीही नाही"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"अंतिम 30 दिवस"</item>
     <item msgid="6600989128423965319">"वापर चक्र सेट करा..."</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 7c5ad12..9dcea5e 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -23,16 +23,16 @@
     <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="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="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 +41,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,9 +73,9 @@
     <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>
@@ -83,46 +84,63 @@
     <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_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_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>
     <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_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_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>
+    <!-- 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">"आपल्‍याकडे ब्लूटुथ सेटिंग्‍ज बदलण्‍याची परवानगी नाही."</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> दृश्यमान असते."</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>
     <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_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="device_picker" msgid="4978696506172252813">"ब्लूटूथ डीव्हाइस निवडा"</string>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
+    <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>
@@ -157,6 +175,11 @@
     <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>
+    <!-- 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) -->
@@ -209,7 +232,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>
@@ -221,19 +244,19 @@
     <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_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>
@@ -254,12 +277,12 @@
     <string name="action_drag_label_move_top" msgid="557081389352288310">"शीर्षस्थानी हलवा"</string>
     <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="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="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>
@@ -270,7 +293,7 @@
     <string name="settings_label" msgid="1626402585530130914">"सेटिंग्ज"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग्ज"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"सेटिंग्ज शॉर्टकट"</string>
-    <string name="activity_list_empty" msgid="6428823323471264836">"कोणत्याही जुळणाऱ्या अॅक्टिव्हिटी आढळल्या नाहीत."</string>
+    <string name="activity_list_empty" msgid="6428823323471264836">"कोणतेही जुळणारे क्रियाकलाप आढळले नाहीत."</string>
     <string name="airplane_mode" msgid="8837269988154128601">"विमान मोड"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"अधिक"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"वायरलेस आणि नेटवर्क"</string>
@@ -329,13 +352,14 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाती"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाती"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"सुरक्षितता आणि स्थान"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"कूटबद्धीकरण आणि क्रेडेन्शियल"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"फोन कूटबद्ध केला"</string>
-    <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"डीव्हाइस एन्क्रिप्‍ट केले"</string>
+    <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>
@@ -353,45 +377,60 @@
     <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>
+    <!-- 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>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डीव्हाइस आणि फिंगरप्रिंट सेंसर स्थानासह चित्रे"</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_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>
@@ -408,8 +447,8 @@
     <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>
@@ -426,7 +465,7 @@
     <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>
@@ -436,31 +475,33 @@
     <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>
     <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_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>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"सुरक्षितता नाही"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"पॅटर्न"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"नमुना"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"मध्यम सुरक्षा"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"पिन"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्यम ते उच्च सुरक्षा"</string>
@@ -468,7 +509,7 @@
     <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="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"फिंगरप्रिंट + पॅटर्न"</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>
@@ -476,29 +517,29 @@
     <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_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_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">
+</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">
 
-</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">
+</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">
 
@@ -516,23 +557,31 @@
 
 </xliff:g>आपले जतन केलेले फिंगरप्रिंट देखील या प्रोफाईल मधून काढले जातील आणि आपण आपले प्रोफाईल अनलॉक करण्यात, खरेदींना अधिकृत करण्यात किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यात सक्षम असणार नाही.\""</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_pattern_title" msgid="2044092014872741130">"अनलॉक नमुना बदला"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदला"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"संकेतशब्द अनलॉक करा बदला"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"पुन्हा प्रयत्न करा. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> पैकी <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> प्रयत्न."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"अखरेचा प्रयत्न"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"तुम्ही या प्रयत्नात चुकीचा कार्य पॅटर्न एंटर केल्यास, तुमचे कार्य प्रोफाईल आणि संबंधित डेटा या डीव्हाइस वरून काढला जाईल."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"तुम्ही या प्रयत्नात चुकीचा कार्य पिन एंटर केल्यास, तुमचे कार्य प्रोफाईल आणि संबंधित डेटा या डीव्हाइस वरून काढला जाईल."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"तुम्ही या प्रयत्नात चुकीचा कार्य पासवर्ड एंटर केल्यास, तुमचे कार्य प्रोफाईल आणि संबंधित डेटा या डीव्हाइस वरून काढला जाईल."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"बरेच चुकीचे प्रयत्न. तुमचे कार्य प्रोफाईल आणि संबंधित डेटा या डीव्हाइस वरून काढला जाईल."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"डिसमिस करा"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"पुन्हा प्रयत्न करा. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> पैकी <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> प्रयत्न."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"तुमचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पॅटर्न टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पिन टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पासवर्ड टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पॅटर्न टाकल्‍यास, हा वापरकर्ता हटवला जाईल"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पिन टाकल्‍यास, हा वापरकर्ता हटवला जाईल"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पासवर्ड टाकल्‍यास, हा वापरकर्ता हटवला जाईल"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पॅटर्न टाकल्‍यास, तुमची कामाची प्रोफाइल आणि त्‍याचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पिन टाकल्‍यास, तुमची कामाची प्रोफाइल आणि त्‍याचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"तुम्‍ही पुढच्‍या वेळी एखादा चुकीचा पासवर्ड टाकल्‍यास, तुमची कामाची प्रोफाइल आणि त्‍याचा डेटा हटवला जाईल"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"बरेच चुकीचे प्रयत्‍न. या डिव्‍हाइसचा डेटा हटवला जाईल."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"बरेच चुकीचे प्रयत्‍न. हा वापरकर्ता हटवला जाईल."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"बरेच चुकीचे प्रयत्‍न. ही कामाची प्रोफाइल आणि त्‍याचा डेटा हटवला जाईल."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"डिसमिस करा"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"किमान <xliff:g id="COUNT">%d</xliff:g> वर्ण असणे आवश्यक आहे"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"पिन किमान <xliff:g id="COUNT">%d</xliff:g> अंकी असणे आवश्यक आहे"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"सुरु ठेवा"</string>
     <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>
@@ -561,14 +610,14 @@
       <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>
@@ -585,17 +634,17 @@
     <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>
+    <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>
     <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_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 +652,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>
@@ -618,14 +667,30 @@
     <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>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"पेअर करा आणि कनेक्ट करा"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"जोडा आणि कनेक्ट करा"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"जोडणे रद्द करा"</string>
     <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="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>
+    <!-- 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>
@@ -633,7 +698,7 @@
     <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_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>
@@ -647,14 +712,14 @@
     <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_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>
@@ -667,13 +732,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>
@@ -696,7 +761,7 @@
     <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_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>
@@ -747,7 +812,6 @@
     <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">"वाय-फाय डिस्‍केनक्‍ट केले. 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>
@@ -771,7 +835,7 @@
     <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>
@@ -810,7 +874,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>
@@ -830,15 +893,15 @@
     <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_rename" msgid="8448896306960060415">"डीव्हाइसला पुन्हा नाव द्या"</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>
     <string name="wifi_p2p_failed_connect_message" msgid="8491862096448192157">"कनेक्ट करु शकलो नाही"</string>
-    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"डीव्हाइसला पुन्हा नाव देण्यात अपयश आले."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"डिव्हाइस पुर्ननामित करण्यात अयशस्वी."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"‍डिस्कनेक्ट करायचे?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"आपण डिस्कनेक्ट केल्यास, <xliff:g id="PEER_NAME">%1$s</xliff:g> सह आपले कनेक्शन समाप्त होईल."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"आपण डिस्कनेक्ट केल्यास, <xliff:g id="PEER_NAME">%1$s</xliff:g> आणि इतर <xliff:g id="PEER_COUNT">%2$s</xliff:g> डिव्हाइसेससह आपले कनेक्शन समाप्त होईल."</string>
@@ -847,9 +910,28 @@
     <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>
+    <!-- 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_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">"हॉटस्पॉट चालू करीत आहे…"</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,7 +978,8 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाय-फाय कॉलिंग चालू असताना, आपला फोन आपल्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा आपल्या वाहकाच्या नेटवर्कद्वारे कॉल मार्गस्थ करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात आपल्या वाहकास विचारा."</string>
-    <string name="emergency_address_title" msgid="3571902448699714454">"आणीबाणी पत्ता अपडेट करा"</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="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
@@ -918,7 +1001,7 @@
     <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="audio_record_proc_title" msgid="4271091199976457534">"नॉइझ कॅंसलेशन"</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>
@@ -953,10 +1036,10 @@
     <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="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,23 +1063,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1113,19 @@
     <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>
+    <!-- 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">"सिम कार्ड लॉक सेटिंग्ज"</string>
@@ -1053,17 +1157,17 @@
     <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_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="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="security_patch" msgid="8438384045870296634">"Android सुरक्षितता पॅच दर्जा"</string>
@@ -1083,7 +1187,7 @@
     <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="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>
@@ -1105,8 +1209,8 @@
     <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>
@@ -1121,30 +1225,30 @@
     <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="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 किंवा TP कार्य सक्रिय आहे"</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="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>
@@ -1164,14 +1268,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,10 +1290,10 @@
     <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>
@@ -1206,9 +1310,9 @@
     <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_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>
@@ -1223,7 +1327,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>
@@ -1273,6 +1377,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>
@@ -1290,18 +1395,21 @@
       <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_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_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"USB स्टोरेज"</b>" मिटविणे आवश्यक आहे."</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">"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>
@@ -1312,7 +1420,7 @@
     <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">"ब्लूटुथ टेदरिंग"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1365,7 +1467,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,7 +1478,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,7 +1523,7 @@
     <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_pattern_header" msgid="6949761069941694050">"आपला पॅटर्न निवडा"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"आपला नमुना निवडा"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"आपला पिन निवडा"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"आपल्या संकेतशब्दाची पुष्टी करा"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"आपल्या नमुन्याची पुष्टी करा"</string>
@@ -1431,68 +1533,74 @@
     <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>
-    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"सुरु ठेवण्यासाठी तुमचे डीव्हाइस पिन एंटर करा"</string>
-    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"सुरु ठेवण्यासाठी तुमचे डीव्हाइस पासवर्ड एंटर करा"</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_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="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"अनलॉक पॅटर्न बदला"</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_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_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>
     <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>
-    <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_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_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_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="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_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="install_all_warning" product="tablet" msgid="8310489909586138165">"आपले टॅबलेट आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स इंस्टॉल करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या टॅबलेटच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
-    <string name="install_all_warning" product="default" msgid="1952257127370115988">"आपला फोन आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स इंस्टॉल करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या फोनच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1513,17 +1621,17 @@
     <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>
+    <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>
@@ -1539,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>
@@ -1548,14 +1656,15 @@
     <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="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="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="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>
@@ -1563,7 +1672,7 @@
     <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="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>
@@ -1580,7 +1689,7 @@
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रिमियम SMS पाठवा"</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="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>
@@ -1593,8 +1702,8 @@
     <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="move_error_device_admin" msgid="8673026002690505763">"डीव्हाइस प्रशासक अॅप बाह्य मीडियावर इंस्टॉल केले जाऊ शकत नाही"</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>
@@ -1607,10 +1716,10 @@
     <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_summary" msgid="6464796332049327547">"अॅप <xliff:g id="APP_STORE">%1$s</xliff:g> मधून इंस्टॉल केला"</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>
@@ -1635,7 +1744,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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"इनपुट सहाय्य"</string>
@@ -1700,7 +1814,7 @@
     <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_dialog_title" msgid="4702613990174126482">"शब्दकोशात जोडा"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"अथ॔पूण॔ वाक्य (Phrase)"</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>
@@ -1713,7 +1827,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>
@@ -1756,7 +1870,7 @@
     <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="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>
@@ -1854,8 +1968,8 @@
     <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_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>
@@ -1863,7 +1977,7 @@
     <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>
+    <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>
@@ -1873,8 +1987,12 @@
       <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_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>
@@ -1903,19 +2021,19 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> शिल्लक"</string>
     <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_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>
     <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 +2048,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,6 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"CPU एकूण"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रस्थान"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"सक्रिय ठेवा"</string>
@@ -1989,14 +2148,14 @@
     <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_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_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,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2082,22 +2243,22 @@
     <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>
     <string name="tts_engine_section_title" msgid="6289240207677024034">"इंजिन"</string>
     <string name="tts_install_voice_title" msgid="6275828614052514320">"व्हॉइस"</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_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">"वाय-फाय सेटिंग अद्ययावत करीत आहे"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटुथ सेटिंग्ज अपडेट करत आहे"</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>
@@ -2113,11 +2274,11 @@
     <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_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_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_reset" msgid="3239382277144980418">"क्रेडेन्शियल साफ करा"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"सर्व प्रमाणपत्रे काढा"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"विश्वसनीय क्रेडेन्शियल"</string>
@@ -2129,20 +2290,20 @@
     <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_for_vpn_and_apps" msgid="4168197158768443365">"VPN आणि अॅप्ससाठी इंस्टॉल केले"</string>
-    <string name="credential_for_wifi" msgid="6228425986551591864">"वाय-फाय साठी इंस्टॉल केले"</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_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_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>
@@ -2159,25 +2320,25 @@
     <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="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="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="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>
-    <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>
@@ -2226,10 +2387,10 @@
     <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" 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_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>
@@ -2261,13 +2422,13 @@
     <!-- 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_pattern" msgid="8423835922362956999">"चुकीचा नमुना"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"चुकीचा संकेतशब्द"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"चुकीचा पिन"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"तपासत आहे..."</string>
@@ -2287,7 +2448,7 @@
     <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_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">"वाय-फाय दर्शवा"</string>
@@ -2326,17 +2487,17 @@
     <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" 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_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_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" 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>
@@ -2345,7 +2506,7 @@
     <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_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>
@@ -2358,7 +2519,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>
@@ -2412,7 +2573,7 @@
     <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>
@@ -2420,7 +2581,7 @@
     <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" 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_none" msgid="9214462857336483711">"काहीही नाही"</string>
@@ -2445,14 +2606,14 @@
     <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_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="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,21 +2624,21 @@
       <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">"वापरकर्ते आणि प्रोफाईल्स"</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>
@@ -2495,10 +2656,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_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>
@@ -2537,12 +2698,12 @@
     <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_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_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>
@@ -2551,7 +2712,7 @@
     <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>
@@ -2614,7 +2775,7 @@
     <string name="sim_settings_title" msgid="6822745211458959756">"सिम कार्ड"</string>
     <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_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">"डेटा सिम निवडण्यासाठी टॅप करा"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"कॉल साठी हे नेहमी वापरा"</string>
@@ -2638,7 +2799,7 @@
     <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_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_popup" msgid="2252915199889604600">"नेटवर्क नाव प्रसारण अक्षम केल्याने लपलेल्या नेटवर्कवर स्वयंचलित कनेक्शन प्रतिबंधित होईल."</string>
@@ -2654,19 +2815,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="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="system_dashboard_summary" msgid="5797743225249766685">"भाषा, वेळ, बॅक अप, अपडेट"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"भाषा, वेळ, बॅक अप, अद्यतने"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिंग्ज"</string>
-    <string name="search_menu" msgid="6283419262313758339">"सेटिंग्ज शोधा"</string>
-    <string name="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>
@@ -2677,7 +2841,7 @@
     <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>
@@ -2697,18 +2861,24 @@
     <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>
+    <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_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_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">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिहिण्यासाठी एक टॅग टॅप करा..."</string>
@@ -2760,7 +2930,7 @@
     <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="6207040454949823153">"कार्य आणि वैयक्तिक प्रोफाइलसाठी ध्वनी सारखे आहेत"</string>
@@ -2784,12 +2954,12 @@
     <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="notification_channel_title" msgid="2260666541030178452">"सूचना प्रकार"</string>
@@ -2814,29 +2984,27 @@
       <item quantity="one">%d अॅप्स सूचना वाचू शकतात</item>
       <item quantity="other">%d अॅप्स सूचना वाचू शकतात</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"इंस्टॉल केलेल्या कोणत्याही अ‍ॅप्सने सूचना प्रवेशाची विनंती केली नाही."</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="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>
+    <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_empty_text" msgid="685224245260197779">"कोणतेही इंस्टॉल केलेले अॅप्स चित्रा मध्‍ये चित्रचे समर्थन करत नाहीत"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"कोणतेही स्थापित केलेले अॅप्स चित्रा मध्‍ये चित्रचे समर्थन करत नाहीत"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"चि. म. चि. चित्रामध्ये"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"चित्रा मध्‍ये चित्र"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"चित्रामध्‍ये चित्राची अनुमती द्या"</string>
     <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>
@@ -2855,7 +3023,7 @@
     </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_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>
@@ -2942,9 +3110,9 @@
     </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" msgid="7712038508173845101">"स्क्रीन चालू असताना अवरोधित करा"</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" 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>
@@ -2952,39 +3120,34 @@
     <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>
     <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>
-    <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_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="imei_information_title" msgid="8499085421609752290">"IMEI माहिती"</string>
@@ -2997,7 +3160,7 @@
     <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_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>
@@ -3030,7 +3193,7 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"कोणत्याही परवानग्यांना मंजूरी दिली नाही"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"कोणत्याही परवानग्यांची विनंती केली नाही"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"सर्व अ‍ॅप्स"</string>
-    <string name="filter_enabled_apps" msgid="5395727306799456250">"इंस्टॉल केलेले अॅप्स"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"स्थापित केलेले अॅप्स"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"इन्स्टंट अ‍ॅप्स"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"वैयक्तिक"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
@@ -3046,7 +3209,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>
@@ -3063,7 +3226,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>
@@ -3093,8 +3256,14 @@
     <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>
+    <!-- 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>
@@ -3111,14 +3280,14 @@
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> अधिक"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"दोष अहवाल सामायिक करायचा?"</string>
     <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अॅप्स आणि डेटा सामायिक केले जाऊ शकतात."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"तुमच्या 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,11 +3296,11 @@
     <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>
@@ -3139,7 +3308,7 @@
     <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_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>
@@ -3187,21 +3356,20 @@
     <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="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_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_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="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_switch_title" msgid="3621381992793251070">"या स्त्रोतातून अनुमती द्या"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"कॅमेर्‍यासाठी दोनदा वळवा"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"आपले मनगट दोनदा वळवून कॅमेरा अॅप उघडा"</string>
@@ -3231,12 +3399,12 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अ‍ॅप्ससाठी बंद</item>
     </plurals>
     <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="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="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>
@@ -3245,7 +3413,7 @@
     <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="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>
@@ -3254,9 +3422,9 @@
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"स्‍क्रीनशॉटला अनुमती नाही"</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,11 +3435,11 @@
     <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">"इंटरनेट केवळ Wi-Fi द्वारे उपलब्ध आहे"</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">"पार्श्वभूमी डेटा केवळ Wi-Fi द्वारे उपलब्ध आहे. Wi-Fi उपलब्ध नसते तेव्हा हे काही अॅप्स किंवा सेवांना प्रभावित करू शकते."</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>
@@ -3282,8 +3450,8 @@
     <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="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>
@@ -3296,8 +3464,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,26 +3484,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="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="home_app" msgid="4066188520886810030">"होम अॅप"</string>
-    <string name="no_default_home" msgid="7184117487704520238">"डीफॉल्ट होम नाही"</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>
@@ -3382,9 +3549,8 @@
     <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>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"इतर डिव्हाइसेसना दृश्यमान नाही"</string>
@@ -3441,34 +3607,61 @@
     <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="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="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>
+    <!-- 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_title" product="device" msgid="3423781975742145894">"डिव्हाइस तपासण्‍यासाठी दोनदा-टॅप करा"</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>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"डिव्हाइस तपासण्‍यासाठी ते उचला"</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">"सूचनांसाठी फिंगरप्रिंट स्वाइप करा"</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>
@@ -3480,10 +3673,10 @@
     <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_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="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>
@@ -3492,10 +3685,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="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_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>
@@ -3506,8 +3699,8 @@
     <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>
+    <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="other">किमान <xliff:g id="COUNT_1">%d</xliff:g> अॅप्स</item>
@@ -3531,16 +3724,16 @@
       <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 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-ms/arrays.xml b/res/values-ms/arrays.xml
index 45beac6..cca58e6 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bagus"</item>
     <item msgid="8986346415847956850">"Sangat baik"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sentiasa"</item>
-    <item msgid="844721238536786870">"Hanya apabila dipalamkan"</item>
-    <item msgid="1986753720941888596">"Jangan sekali-kali"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sentiasa"</item>
-    <item msgid="7433294150916905997">"Hanya apabila dipasang"</item>
-    <item msgid="1390404486722375028">"Jangan sekali-kali"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 hari terakhir"</item>
     <item msgid="6600989128423965319">"Ttpkn kitar penggunaan..."</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 8b1b2dd..9483aad 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Nafikan"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Tutup"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Tukar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Anda kini <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> langkah daripada menjadi pembangun.</item>
       <item quantity="one">Anda kini <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> langkah daripada menjadi pembangun.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Anda tidak mempunyai kebenaran untuk menukar tetapan Bluetooth."</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> kelihatan kepada peranti yang berhampiran semasa tetapan Bluetooth dibuka."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Peranti anda"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Tukar corak buka kunci"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Cuba lagi. Percubaan <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> daripada <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Percubaan terakhir"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jika anda masukkan corak kerja yang salah pada percubaan ini, profil kerja anda dan data yang berkaitan akan dialih keluar daripada peranti ini."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jika anda masukkan PIN kerja yang salah pada percubaan ini, profil kerja anda dan data yang berkaitan akan dialih keluar daripada peranti ini."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jika anda masukkan kata laluan kerja yang salah pada percubaan ini, profil kerja anda dan data yang berkaitan akan dialih keluar daripada peranti ini."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Terlalu banyak percubaan salah. Profil kerja anda dan data yang berkaitan akan dialih keluar daripada peranti ini."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Tolak"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Cuba lagi. Percubaan <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> daripada <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Data anda akan dipadamkan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jika anda memasukkan corak yang salah pada percubaan seterusnya, data peranti ini akan dipadamkan"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jika anda memasukkan PIN yang salah pada percubaan seterusnya, data peranti ini akan dipadamkan"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jika anda memasukkan kata laluan yang salah pada percubaan seterusnya, data peranti ini akan dipadamkan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jika anda memasukkan corak yang salah pada percubaan seterusnya, pengguna ini akan dipadamkan"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jika anda memasukkan PIN yang salah pada percubaan seterusnya, pengguna ini akan dipadamkan"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jika anda memasukkan kata laluan yang salah pada percubaan seterusnya, pengguna ini akan dipadamkan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jika anda memasukkan corak yang salah pada percubaan seterusnya, profil kerja anda dan data profil itu akan dipadamkan"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jika anda memasukkan PIN yang salah pada percubaan seterusnya, profil kerja anda dan data profil itu akan dipadamkan"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jika anda memasukkan kata laluan yang salah pada percubaan seterusnya, profil kerja anda dan data profil itu akan dipadamkan"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Terlalu banyak percubaan yang salah. Data peranti ini akan dipadamkan."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Terlalu banyak percubaan yang salah. Pengguna ini akan dipadamkan."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Terlalu banyak percubaan yang salah. Profil kerja ini dan data profil itu akan dipadamkan."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ketepikan"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Mestilah sekurang-kurangnya <xliff:g id="COUNT">%d</xliff:g> aksara"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN mestilah sekurang-kurangnya <xliff:g id="COUNT">%d</xliff:g> digit"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Teruskan"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Tetapan keselamatan penghala wayarles (TKIP) tidak disokong"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pengesahan gagal. Sila cuba lagi."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Sesi WPS lain dikesan. Sila cuba lagi dalam beberapa minit."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi diputuskan sambungan. Persediaan WPS dibatalkan."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nama rangkaian"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Masukkan SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Keselamatan"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Masa mula"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Masa tamat"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Hidup / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Aktifkan skrin apabila anda menerima pemberitahuan"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sentiasa hidup"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tunjukkan masa, ikon pemberitahuan dan maklumat lain"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Besarkan atau kecilkan teks"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Tetapan kunci kad SIM"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Padam kad SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Padamkan semua data pada storan USB dalaman, seperti muzik atau foto"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Padamkan semua data pada kad SD, seperti muzik atau foto"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Padamkan eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Padamkan semua eSIM pada telefon. Tindakan ini tidak membatalkan pelan perkhidmatan mudah alih anda."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Padamkan semua eSIM pada tablet. Tindakan ini tidak membatalkan pelan perkhidmatan mudah alih anda."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tetapkan semula tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tetapkan semula telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Padamkan semua maklumat peribadi anda dan aplikasi yang dimuat turun? Anda tidak boleh membuat asal tindakan ini!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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 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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Dijalankan"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Storan USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pada kad SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Dilumpuhkan"</string>
     <string name="not_installed" msgid="2797554494953450291">"Tidak dipasang bg pengguna ini"</string>
     <string name="installed" msgid="3070865169422600098">"Dipasang"</string>
     <string name="no_applications" msgid="7336588977497084921">"Tiada aplikasi."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Skrin"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampu suluh"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Apl lalai"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Bahasa, masa, sandaran, kemas kini"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Tetapan"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Carian tetapan"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Carian tetapan"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Tetapan carian"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Tetapan carian"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, sambungan rangkaian"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mesej teks, menghantar teks, mesej, pemesejan"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"selular, mudah alih, pembawa selular, wayarles, data, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gerak isyarat"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"bayar, ketik, bayaran"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sandaran, sandarkan"</string>
+    <!-- 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">"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>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Pasang apl yang tidak diketahui"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Kebenaran apl mengubah suai tetapan sistem"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Benarkan pengubahsuaian tetapan sistem"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Kebenaran ini membolehkan apl mengubah suai tetapan sistem."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Benarkan daripada sumber ini"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Pusing dua kali untuk membuka kamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Buka apl kamera dengan memusingkan pergelangan tangan anda dua kali"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatik"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Kosongkan ruang sekarang"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gerak isyarat"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Pintasan gerak isyarat"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gerak isyarat pantas untuk mengawal telefon anda"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gerak isyarat pantas untuk mengawal tablet anda"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gerak isyarat pantas untuk mengawal peranti anda"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Langkau ke kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Untuk membuka kamera dengan cepat, tekan butang kuasa dua kali. Berfungsi daripada sebarang skrin."</string>
+    <!-- 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">"Balikkan kamera"</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">"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>
+    <!-- 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">"Angkat untuk menyemak telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Angkat untuk menyemak tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Angkat untuk menyemak peranti"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Untuk menyemak pemberitahuan dengan pantas, angkat telefon anda."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Untuk menyemak pemberitahuan dengan pantas, angkat tablet anda."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Untuk menyemak pemberitahuan dengan pantas, angkat peranti anda."</string>
+    <!-- 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">"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>
+    <!-- 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">"Angkat untuk membuka kamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Untuk membuka kamera secara automatik, angkat telefon anda pada kedudukan mengambil gambar (landskap atau potret). Berfungsi apabila telefon tidur atau dikunci."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ambil foto apabila telefon tidur atau dikunci"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gerak isyarat bantu"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Kepekaan"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-my/arrays.xml b/res/values-my/arrays.xml
index 6afd139..7a8f67a 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ကောင်းသည်"</item>
     <item msgid="8986346415847956850">"အလွန်ကောင်းသည်"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"အမြဲတမ်း"</item>
-    <item msgid="844721238536786870">"ကြိုးဖြင့်ဆက်ထားသည့်အခါသာ"</item>
-    <item msgid="1986753720941888596">"ဘယ်တော့မှ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"အမြဲတမ်း"</item>
-    <item msgid="7433294150916905997">"ကြိုးဖြင့်ဆက်ထားသည့်အခါသာ"</item>
-    <item msgid="1390404486722375028">"ဘယ်တော့မှ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"နောက်ဆုံး ရက် ၃၀"</item>
     <item msgid="6600989128423965319">"သုံးစွဲမှု စက်ဝန်း သတ်မှတ်ရန်..."</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 9f97482..04fb09d 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"ငြင်းပယ်ခြင်း"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ပိတ်ရန်"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"အကြောင်းအရာ မသိရှိ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">သင်သည် ယခု ဆောဖ့်ဝဲရေးသားသူထံမှ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> အဆင့်အကွာအဝေးတွင် ရှိနေပါသည်။</item>
       <item quantity="one">သင်သည် ယခု ဆောဖ့်ဝဲရေးသားသူထံမှ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> အဆင့် အကွာအဝေးတွင်ရှိနေပါသည်။</item>
     </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 +41,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 +107,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">"ဘလူးတုသ် ဆက်တင်များကို ပြောင်းလဲရန် သင့်ဆီမှာ ခွင့်ပြုချက် မရှိပါ။"</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> အား အနီးရှိ စက်ကိရိယာများမှ မြင်နိုင်၏။"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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) -->
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"အကောင့်များ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"တည်နေရာ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"အကောင့်များ"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"လုံခြုံရေးနှင့် တည်နေရာ"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"အသွင်ဝှက်ခြင်းနှင့် အထောက်အထားများ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ဖုန်းကို အသွင်ဝှက်ထားသည်"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"စက်ပစ္စည်းကို အသွင်ဝှက်ထားသည်"</string>
@@ -354,40 +378,55 @@
     <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>
+    <!-- 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>
@@ -449,6 +488,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,7 +507,7 @@
     <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>
@@ -519,13 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"သော့ဖွင့်ရန်ပုံဖော်မှုအား ပြောင်းမည်"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ပင်နံပါတ်ပြောင်းမည်"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ဖွင့်ရန်စကားဝှက်အား ပြောင်းမည်"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ထပ်စမ်းကြည့်ပါ။ <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> အတွင်းမှ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ခေါက်ကြိုးပမ်းမှု ဖြစ်သည်။"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"နောက်ဆုံးအကြိမ် စမ်းခြင်းဖြစ်သည်"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ဤကြိုးပမ်းမှုတွင် မမှန်ကန်သည့်အလုပ်သုံး ပုံစံအား သင်ထည့်သွင်းခဲ့မည်ဆိုလျှင်၊ သင့်စက်ပစ္စည်းမှ သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်ဒေတာများကို ဖယ်ရှားသွားပါမည်။"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ဤကြိုးပမ်းမှုတွင် မမှန်ကန်သည့်အလုပ်သုံး ပင်နံပါတ်အား သင်ထည့်သွင်းခဲ့မည်ဆိုလျှင်၊ သင့်စက်ပစ္စည်းမှ သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်ဒေတာများကို ဖယ်ရှားသွားပါမည်။"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ဤကြိုးပမ်းမှုတွင် မမှန်ကန်သည့်အလုပ်သုံး စကားဝှက်အား သင်ထည့်သွင်းခဲ့မည်ဆိုလျှင်၊ သင့်စက်ပစ္စည်းမှ သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်ဒေတာများကို ဖယ်ရှားသွားပါမည်။"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"မှားယွင်းသည့် ကြိုးပမ်းမှု အလွန်များနေပါပြီ။ ဤစက်ပစ္စည်းမှ သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်ဒေတာများကို ဖယ်ရှားသွားပါမည်။"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ပယ်ရန်"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ထပ်စမ်းကြည့်ပါ။ စုစုပေါင်း <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> ကြိမ်အနက်မှ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ကြိမ် ကြိုးပမ်းမှုဖြစ်သည်။"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"သင်၏ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ပုံစံအမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက ဤစက်ပစ္စည်းရှိ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"PIN နံပါတ် အမှားဖြင့် နောက်တစ်ကြိမ် ကြိုးပမ်းပါက ဤစက်ပစ္စည်းရှိ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"စကားဝှက်အမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက ဤစက်ပစ္စည်းရှိ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ပုံစံအမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက ဤအသုံးပြုသူအကောင့် ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"PIN နံပါတ် အမှားဖြင့် နောက်တစ်ကြိမ် ကြိုးပမ်းပါက ဤအသုံးပြုသူအကောင့် ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"စကားဝှက်အမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက ဤအသုံးပြုသူအကောင့် ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ပုံစံအမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက သင်၏အလုပ်ပရိုဖိုင်နှင့် ၎င်း၏ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"PIN နံပါတ် အမှားဖြင့် နောက်တစ်ကြိမ် ကြိုးပမ်းပါက သင်၏အလုပ်ပရိုဖိုင်နှင့် ၎င်း၏ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"စကားဝှက်အမှားဖြင့် နောက်တစ်ကြိမ်ကြိုးပမ်းပါက သင်၏အလုပ်ပရိုဖိုင်နှင့် ၎င်း၏ ဒေတာများ ပျက်သွားပါလိမ့်မည်"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"မှားယွင်းစွာကြိုးပမ်းထားသော အကြိမ်ရေများနေပါပြီ။ ဤစက်ပစ္စည်းရှိ ဒေတာများပျက်သွားပါလိမ့်မည်။"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"မှားယွင်းစွာကြိုးပမ်းထားသော အကြိမ်ရေများနေပါပြီ။ ဤအသုံးပြုသူအကောင့် ပျက်သွားပါလိမ့်မည်။"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"မှားယွင်းစွာကြိုးပမ်းထားသော အကြိမ်ရေများနေပါပြီ။ ဤအလုပ်ပရိုဖိုင်နှင့် ၎င်း၏ ဒေတာများ ပျက်သွားပါလိမ့်မည်။"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ပယ်ရန်"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"အနည်းဆုံး အက္ခရာ <xliff:g id="COUNT">%d</xliff:g> လုံး ရှိရမည်"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ပင်နံပါတ်သည် အနည်းဆုံး ဂဏန်း <xliff:g id="COUNT">%d</xliff:g> လုံးရှိရမည်"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ဆက်လုပ်ရန်"</string>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +812,6 @@
     <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_ssid" msgid="5519636102673067319">"ကွန်ရက် အမည်"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID ထည့်သွင်းရန်"</string>
     <string name="wifi_security" msgid="6603611185592956936">"လုံခြုံရေး"</string>
@@ -810,7 +874,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>
@@ -847,9 +910,28 @@
     <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>
+    <!-- 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_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">"ဟော့စပေါ့ ဖွင့်နေသည် …"</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 +978,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>
@@ -980,24 +1063,34 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1006,7 +1099,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>
@@ -1015,13 +1108,24 @@
     <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>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ယခု စတင်ပါ"</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>
+    <!-- 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">"ဆင်းမ်ကဒ် လော့ခ်ဆက်တင်များ"</string>
@@ -1273,6 +1377,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>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SDကတ်အား ဖျက်ရန်"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SDကဒ်ထဲရှိ သီချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM များကို ဖျက်ရန်"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ဖုန်းထဲရှိ eSIMs အားလုံးကို ဖျက်လိုက်ပါ။ ဤသို့ပြုလုပ်ခြင်းဖြင့် သင်၏ မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်ကို ဖျက်သိမ်းလိမ့်မည်မဟုတ်ပါ။"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"တက်ဘလက်ထဲရှိ eSIMs အားလုံးကို ဖျက်လိုက်ပါ။ ၎င်းသည် သင်၏ မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်ကို ပယ်ဖျက်လိုက်မည်မဟုတ်ပါ။"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"တက်ဘလက်ကို အစမှပြန်လည်စတင်စေရန်"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ဖုန်းကို အစမှပြန်လည်စတင်စေရန်"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"သင့်ကိုယ်ပိုင်အချက်အလက်များနှင့် ဒေါင်းလုပ်ပြုလုပ်ထားသောအပလီကေးရှင်းများကို ဖျက်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍မရပါ!"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1510,7 +1618,7 @@
     </plurals>
     <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="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>
@@ -1550,6 +1658,7 @@
     <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="default" msgid="1477351142334784771">"SD ကဒ်ပေါ်တွင်"</string>
+    <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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"စာရိုက်ခြင်း အထောက်အကူပြုစနစ်"</string>
@@ -1873,6 +1987,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>
@@ -1939,21 +2057,62 @@
     <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">"ဘလူးတုသ်"</string>
-    <string name="power_cell" msgid="3392999761958982492">"မိုဘိုင်းကွန်ရက် အရန်သင့်"</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="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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <string name="usage_type_cpu" msgid="715162150698338714">"စုစုပေါင်းCPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUအနီးမြင်ကွင်း"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ဖွင့်လျှက်ထားရှိရန်"</string>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- 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>
@@ -2501,7 +2662,7 @@
     <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_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>
@@ -2654,17 +2815,20 @@
       <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="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="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">"Wi-Fi ၊ 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>
@@ -2709,6 +2873,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">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ရေးရန် တဲဂ် တစ်ခုကို ပုပ်ပါ..."</string>
@@ -2724,7 +2894,7 @@
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"ဖုန်းမြည်သံ အတိုးအကျယ် ၈၀% ဖြစ်သည်"</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="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>
@@ -2831,14 +3001,12 @@
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"ထည့်သွင်းထားသည့် အက်ပ်တစ်ခုမျှ မျက်နှာပြင်ပေါ်တွင် တစ်ခုပေါ်တစ်ခု ထပ်၍ဖွင့်ခြင်းကို ခွင့်မပြုပါ"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခြင်း"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခြင်း"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"တစ်ခုပေါ်တစ်ခု ထပ်၍ ဖွင့်ခွင့်ပြုရန်"</string>
-    <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="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="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>
@@ -2861,8 +3029,8 @@
     <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>
@@ -2880,7 +3048,7 @@
     <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_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>
@@ -2901,16 +3069,16 @@
     <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"စည်းမျဉ်းမတွေ့ပါ။"</string>
     <string name="zen_mode_rule_summary_enabled_combination" msgid="976098744828219297">"ဖွင့် <xliff:g id="MODE">%1$s</xliff:g>"</string>
     <string name="zen_mode_rule_summary_provider_combination" msgid="2101201392041867409">"<xliff:g id="PACKAGE">%1$s</xliff:g>\n<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
-    <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"နေ့များ"</string>
+    <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>
     <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_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>
@@ -2943,9 +3111,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">"Do Not Disturb မှ ပိတ်ထားသည့် အကြောင်းကြားချက်များက မျက်နှာပြင်ပေါ်တွင် ဖော်ပြခြင်း သို့မဟုတ် ပေါ်လာခြင်းတို့မလုပ်နိုင်ရန် တားဆီးပါ"</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">"Do Not Disturb ကပိတ်ထားသော်လည်း မျက်နှာပြင်ကိုဖွင့်ခြင်း သို့မဟုတ် သတိပေးချက်မှိတ်တုတ်မီးပြခြင်းတို့အားဖြင့် အကြောင်းကြားခြင်းများကို တားဆီးပါ"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Do Not Disturb သည်သတိပေးချက်များ မျက်နှာပြင်ပေါ်တွင် မဖော်ပြခြင်းကို ကာကွယ်ပါ"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ပိတ်ရန်"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"မျက်နှာပြင် ဖွင့်ထားစဉ်"</string>
@@ -2965,11 +3133,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 +3140,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,15 +3258,21 @@
     <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>
+    <!-- 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_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="battery_summary" msgid="8044042095190688654">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် <xliff:g id="PERCENTAGE">%1$s</xliff:g> အသုံးပြုထားပါသည်"</string>
-    <string name="battery_power_management" msgid="5571519699679107523">"ဘက်ထရီသုံးစွဲမှုကို စီမံရန်"</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 Tuner ပြရန်"</string>
@@ -3187,8 +3356,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">"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="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>
@@ -3200,8 +3370,6 @@
     <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">"Yes"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"No"</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>
@@ -3296,8 +3464,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 +3484,7 @@
       <item quantity="one">ဒေတာချွေတာမှုဖွင့်ထားချိန်တွင် ကန့်သတ်မှုမရှိသည့်ဒေတာကို အသုံးပြုရန် အက်ပ်၁ ခုကိုခွင့်ပြုထားသည်</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ဒေတာချွေတာမှုစနစ်"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ဒေတာကန့်သတ်မှု မရှိခြင်း"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"ကန့်သတ်မထားသည့် ဒေတာ"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"နောက်ခံဒေတာကို ပိတ်ထားသည်"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ဖွင့်ပါ"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ပိတ်ထားသည်"</string>
@@ -3382,7 +3549,6 @@
     <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_warning" msgid="9086859595338944882">"ပရီမီယံ SMS သည်ငွေကြေးကုန်ကျနိုင်ပြီး သင့်ဖုန်းဝန်​ဆောင်မှုပေးသူ၏ ငွေတောင်းခံလွှာသို့ ပေါင်း၍ ထည့်သွင်းပါမည်။ အက်ပ်တစ်ခုကို သင်ခွင့်ပြုလိုက်လျှင် ၎င်းအက်ပ်ကိုအသုံးပြုပြီး ပရီမီယံ SMS ပို့နိုင်မည်ဖြစ်သည်။"</string>
@@ -3447,28 +3613,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>
+    <!-- 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 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>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-nb/arrays.xml b/res/values-nb/arrays.xml
index 1dab99f..b92038b 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bra"</item>
     <item msgid="8986346415847956850">"Utmerket"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Alltid"</item>
-    <item msgid="844721238536786870">"Bare når tilkoblet strøm"</item>
-    <item msgid="1986753720941888596">"Aldri"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Alltid"</item>
-    <item msgid="7433294150916905997">"Bare når tilkoblet strøm"</item>
-    <item msgid="1390404486722375028">"Aldri"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"De siste 30 dagene"</item>
     <item msgid="6600989128423965319">"Angi brukssyklus"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4cb041a..6ffd5b2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Avslå"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Lukk"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Bytt"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Nå er du <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steg fra å bli utvikler.</item>
       <item quantity="one">Nå er du <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> steg fra å bli utvikler.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Du har ikke tillatelse til å endre Bluetooth-innstillingene."</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> er synlig for enheter i nærheten mens Bluetooth-innstillingene er åpne."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Enhetene dine"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Endre opplåsingsmønster"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Endre PIN-koden for opplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Endre passord for opplåsning"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Prøv på nytt. Forsøk <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> av <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Siste forsøk"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Hvis du skriver inn feil mønster på dette forsøket, fjernes jobbprofilen og tilknyttede data fra enheten."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Hvis du skriver inn feil PIN-kode på dette forsøket, fjernes jobbprofilen og tilknyttede data fra enheten."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Hvis du skriver inn feil passord på dette forsøket, fjernes jobbprofilen og tilknyttede data fra enheten."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"For mange mislykkede forsøk. Jobbprofilen og tilknyttede data fjernes fra enheten."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Avvis"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Prøv på nytt. Forsøk <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> av <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Dataene dine blir slettet"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Hvis du oppgir feil mønster på neste forsøk, slettes dataene på denne enheten"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Hvis du skriver inn feil PIN-kode på neste forsøk, slettes dataene på denne enheten"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Hvis du skriver inn feil passord på neste forsøk, slettes dataene på denne enheten"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Hvis du oppgir feil mønster på neste forsøk, slettes denne brukeren"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Hvis du skriver inn feil PIN-kode på neste forsøk, slettes denne brukeren"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Hvis du skriver inn feil passord på neste forsøk, slettes denne brukeren"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Hvis du oppgir feil mønster på neste forsøk, slettes jobbprofilen din og tilknyttede data"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Hvis du skriver inn feil PIN-kode på neste forsøk, slettes jobbprofilen din og tilknyttede data"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Hvis du skriver inn feil passord på neste forsøk, slettes jobbprofilen din og tilknyttede data"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"For mange mislykkede forsøk. Dataene på denne enheten blir slettet."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"For mange mislykkede forsøk. Denne brukeren blir slettet."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"For mange mislykkede forsøk. Denne jobbprofilen og tilknyttede data blir slettet."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Avvis"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Må være minst <xliff:g id="COUNT">%d</xliff:g> tegn"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-koden må være minst <xliff:g id="COUNT">%d</xliff:g> sifre"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsett"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhetsinnstillingen (TKIP) for trådløse rutere støttes ikke"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfeil. Prøv på nytt."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annen WPS-økt ble oppdaget. Prøv på nytt om noen minutter."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi ble koblet fra. WPS-konfigureringen ble avbrutt."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nettverksnavn"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Skriv inn SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhet"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Starttid"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Sluttid"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"På / <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">"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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"Skjermen slås på når du mottar varsler"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Alltid på"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vis klokkeslett, varselikoner og annen informasjon"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gjør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Tøm SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Slett alle data på intern USB-lagring, som for eksempel musikk eller bilder"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Slett alle data fra SD-kortet, som musikk og bilder"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Tøm e-SIM-kort"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Tøm alle e-SIM-kortene i telefonen. Dette avslutter ikke mobilabonnementet ditt."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Tøm alle e-SIM-kortene i nettbrettet. Dette avslutter ikke mobilabonnementet ditt."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tilbakestill nettbrettet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tilbakestill telefonen"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vil du slette den personlige informasjonen din og nedlastede apper? Du kan ikke angre denne handlingen."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Kjører"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På minnekort"</string>
+    <string name="disabled" msgid="9206776641295849915">"Slått av"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ikke installert for brukeren"</string>
     <string name="installed" msgid="3070865169422600098">"Installert"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ingen apper."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Skjerm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lommelykt"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Standardapper"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Språk, tid, sikkerhetskopiering, oppdateringer"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Innstillinger"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Søk i innstillingene"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Søk i innstillingene"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Søkeinnstillinger"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Søkeinnstillinger"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, Wi-Fi, nettverkstilkobling"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, sende tekstmelding, meldinger, sende meldinger"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilnett, mobil, mobiloperatør, trådløs, data, 4G, 3G, 2G, LTE"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"bevegelse"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betal, trykk på, betalinger"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sikkerhetskopi, sikkerhetskopiér"</string>
+    <!-- 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">"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>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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 +3257,12 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Bruksvarsler"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Vis fullstendig enhetsbruk"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Vis appbruk"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Høy bruk"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apper oppfører seg unormalt</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> oppfører seg unormalt</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Installer ukjente apper"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Apptillatelse til å endre systeminnstillingene"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Tillat endring av systeminnstillingene"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Med denne tillatelsen kan apper endre systeminnstillingene."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Tillat fra denne kilden"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Vri to ganger for å åpne kameraet"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Åpne kameraappen ved å vri to ganger på håndleddet"</string>
@@ -3296,8 +3463,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>
@@ -3317,7 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisk"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuelle innstillinger"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Frigjør lagringsplass nå"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Bevegelser"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Bevegelsessnarveier"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Hurtigbevegelser for å kontrollere telefonen din"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Hurtigbevegelser for å kontrollere nettbrettet ditt"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Hurtigbevegelser for å kontrollere enheten din"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Åpne kameraet raskt"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Trykk på av/på-knappen to ganger for å åpne kameraet raskt. Dette fungerer fra alle skjermbilder."</string>
+    <!-- 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">"Vend kameraet"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Varsler med fingeravtrykksensor"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av telefonen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av nettbrettet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av enheten."</string>
+    <!-- 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">"Løft for å åpne kameraet"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"For å åpne kameraet automatisk, løft telefonen din opp til en fotograferingsposisjon (liggende eller stående format). Dette fungerer når telefonen din er låst eller i hvilemodus."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ta bilder når telefonen er låst eller i hvilemodus"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistansebevegelse"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensivitet"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-ne/arrays.xml b/res/values-ne/arrays.xml
index bc56170..a234d9f 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"राम्रो"</item>
     <item msgid="8986346415847956850">"उत्कृष्ट"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"सधैं"</item>
-    <item msgid="844721238536786870">"प्लग इन भएपछि मात्र"</item>
-    <item msgid="1986753720941888596">"कहिल्यै पनि होइन"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"सधैँ"</item>
-    <item msgid="7433294150916905997">"केवल प्लग गरेको बेलामा मात्र"</item>
-    <item msgid="1390404486722375028">"कहिल्यै पनि होइन"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"अन्तिम ३० दिन"</item>
     <item msgid="6600989128423965319">"प्रयोग चक्र सेट..."</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 2f3a617..38237c9 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -23,13 +23,13 @@
     <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="other">अहिले तपाईं विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item>
       <item quantity="one">अहिले तपाईं विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item>
     </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 +41,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 +107,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">"तपाईं सँग ब्लुटुथ सेटिङ्हरू परिवर्तन गर्न अनुमति छैन।"</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> लाई नजिकैका उपकरणहरू देख्न सक्नेछन्।"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"अनलक ढाँचा बदल्नुहोस्"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलक PIN परिवर्तन गर्नुहोस्"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलक पासवर्ड परिवर्तन गर्नुहोस्"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"फेरि प्रयास गर्नुहोस्। प्रयास <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> को <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"अन्तिम प्रयास"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"तपाईंले यो प्रयासमा गलत कार्य ढाँचा प्रविष्ट गर्नुभयो भने, तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"तपाईंले यो प्रयासमा गलत कार्य PIN प्रविष्ट गर्नुभयो भने, तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"तपाईंले यो प्रयासमा गलत कार्य पासवर्ड प्रविष्ट गर्नुभयो भने, तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"धेरै पकट गलत प्रयास गरियो। तपाईंको कार्य प्रोफाइल र सम्बन्धित डेटा यो यन्त्रबाट हटाइनेछ।"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"खारेज गर्नुहोस्"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"फेरि प्रयास गर्नुहोस्। <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> मध्ये <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> प्रयास"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"तपाईंको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"तपाईंले अर्को प्रयासमा गलत ढाँचा प्रविष्ट गर्नुभयो भने यो यन्त्रका डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"तपाईंले अर्को प्रयासमा गलत PIN प्रविष्ट गर्नुभयो भने यो यन्त्रको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"तपाईंले अर्को प्रयासमा गलत पासवर्ड प्रविष्ट गर्नुभयो भने यो यन्त्रका डेटालाई मेटाइनेछ।"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"तपाईंले अर्को प्रयासमा गलत ढाँचा प्रविष्ट गर्नुभयो भने यो प्रयोगकर्ताको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"तपाईंले अर्को प्रयासमा गलत PIN प्रविष्ट गर्नुभयो भने यो प्रयोगकर्ताको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"तपाईंले अर्को प्रयासमा गलत पासवर्ड प्रविष्ट गर्नुभयो भने यो प्रयोगकर्तालाई मेटाइनेछ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"तपाईंले अर्को प्रयासमा गलत ढाँचा प्रविष्ट गर्नुभयो भने तपाईंको कार्य प्रोफाइल र यसको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"तपाईंले अर्को प्रयासमा गलत PIN प्रविष्ट गर्नुभयो भने तपाईंको कार्य प्रोफाइल र यसको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"तपाईंले अर्को प्रयासमा गलत पासवर्ड प्रविष्ट गर्नुभयो भने तपाईंको कार्य प्रोफाइल र यसको डेटालाई मेटाइनेछ"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"धेरै पकट गलत प्रयास गरियो। यो यन्त्रका डेटालाई मेटाइनेछ।"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"धेरै पकट गलत प्रयास गरियो। यो प्रयोगकर्तालाई मेटाइनेछ"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"धेरै पकट गलत प्रयास गरियो। यो कार्य प्रोफाइल र यसको डेटालाई मेटाइनेछ।"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"खारेज गर्नुहोस्"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> वटा वर्ण हुनु अनिवार्य छ"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN कम्तीमा पनि <xliff:g id="COUNT">%d</xliff:g> अङ्कको हुनु अनिवार्य छ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"जारी राख्नुहोस्"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"सञ्जाल नाम"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID प्रविष्टि गर्नुहोस्"</string>
     <string name="wifi_security" msgid="6603611185592956936">"सुरक्षा"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"हटस्पट खुल्दै..."</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD कार्ड मेटाउनुहोस्"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"आन्तरिक USB भण्डारणमा सबै डेटा मेटाउनुहोस्, जस्तै संगीत वा फोटाहरू"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD कार्डबाट सबै डाटाहरू जस्तै संगीत वा फोटाहरू मेटाउनुहोस्"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM हरूलाई मेटाउनुहोस्"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"उक्त फोनमा भएका सबै eSIM हरूलाई मेटाउनुहोस्। यस कार्यले तपाईंको मोबाइल सेवाको योजना रद्द गर्नेछैन।"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"उक्त ट्याब्लेटमा भएका सबै eSIM हरूलाई मेटाउनुहोस्। यस कार्यले तपाईंको मोबाइल सेवाको योजना रद्द गर्नेछैन।"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ट्याब्लेट पुनःसेट गर्नुहोस्"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन पुनःसेट गर्नुहोस्"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"तपाईंका सबै व्यक्तिगत जानकारी र डाउनलोड गरिएका अनुप्रयोगहरू मेट्ने हो? तपाईं यो कार्य अनडू गर्न सक्नुहुन्न!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SD कार्डमा"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"इनपुट सम्बन्धी सहायता"</string>
@@ -1873,6 +1986,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>
@@ -1939,6 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"CPU कुल"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभूमि"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"जागा रहनुहोस्"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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="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>
@@ -2654,17 +2814,20 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"सेलुलर, मोबाइल, सेल वाहक, वायरलेस, डेटा, 4G, 3G, 2G, lte"</string>
@@ -2709,6 +2872,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>
@@ -2827,14 +2996,12 @@
     <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">"Picture-in-picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"स्थापना गरिएका कुनै पनि अनुप्रयोगहरूले Picture-in-picture मोडलाई समर्थन गर्दैनन्"</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">"तस्बिरमा तस्बिर मोडमा तस्बिर"</string>
-    <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="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="manage_zen_access_title" msgid="2611116122628520522">"पहुँचमा बाधा नपुर्‍यानुहोस्"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"कुनै पनि स्थापित अनुप्रयोगहरू द्वारा पहुँचमा बाधा नपुर्‍यानुहोस् को माग गरेका छैनन्"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अनुप्रयोगहरू लोड हुँदै..."</string>
@@ -2965,11 +3132,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 +3139,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 +3257,12 @@
     <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>
+    <!-- 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>
@@ -3187,8 +3355,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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"यो स्रोतबाट अनुमति दिनुहोस्‌"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"क्यामेराका लागि दुई पटक बटार्नुहोस्"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"दुई पटक आफ्नो नारी बटारेर क्यामेरा अनुप्रयोग खोल्नुहोस्"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3384,7 +3550,6 @@
     <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_warning" msgid="9086859595338944882">"प्रिमियम SMS सक्रिय गर्नाले तपाईंलाई पैसा लाग्न सक्छ र उक्त रकम तपाईंको वाहकलाई तिर्नु पर्ने बिलमा जोडिनेछ। यदि तपाईं अनुप्रयोगको लागि अनुमति सक्रिय गर्नुहुन्छ भने तपाईं त्यस अनुप्रयोगको प्रयोग गरेर प्रिमियम SMS पठाउन सक्नुहुनेछ।"</string>
@@ -3449,28 +3614,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3574,6 +3766,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 +3780,10 @@
     <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>
+    <!-- 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-nl/arrays.xml b/res/values-nl/arrays.xml
index 133809b..f71a6ad 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Goed"</item>
     <item msgid="8986346415847956850">"Uitstekend"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Altijd"</item>
-    <item msgid="844721238536786870">"Alleen tijdens laden"</item>
-    <item msgid="1986753720941888596">"Nooit"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Altijd"</item>
-    <item msgid="7433294150916905997">"Alleen tijdens laden"</item>
-    <item msgid="1390404486722375028">"Nooit"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Afgelopen 30 dagen"</item>
     <item msgid="6600989128423965319">"Gebruikscyclus instellen…"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7fa6fd4..3ef4c06 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Weigeren"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Sluiten"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Overschakelen"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Je moet nog <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> stappen uitvoeren om ontwikkelaar te worden.</item>
       <item quantity="one">Je moet nog <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> stap uitvoeren om ontwikkelaar te worden.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Je hebt geen toestemming om de Bluetooth-instellingen te wijzigen."</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> is zichtbaar voor apparaten in de buurt wanneer het venster \'Bluetooth-instellingen\' is geopend."</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> ontkoppelen?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitzending"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profiel uitschakelen?"</string>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Je apparaten"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Datum en tijd"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Een tijdzone kiezen"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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>
@@ -408,11 +446,11 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet versleutelen"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoon versleutelen"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Versleuteld"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"Je kunt je accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden versleutelen. Als je een schermvergrendeling hebt ingesteld (dat wil zeggen: een patroon of numerieke pincode of wachtwoord), moet je na het versleutelen van je telefoon het scherm ontgrendelen om de tablet te ontsleutelen wanneer je de tablet inschakelt. De enige andere manier om de tablet te ontsleutelen is de fabrieksinstellingen terugzetten, waarbij al je gegevens worden gewist.\n\nversleutelen duurt een uur of langer. Je moet beginnen met een opgeladen batterij en je telefoon moet gedurende het proces zijn aangesloten op een stopcontact. Als je het proces onderbreekt, verlies je een deel van je gegevens of alle gegevens"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Je kunt je accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden versleutelen. Als je een schermvergrendeling hebt ingesteld (dat wil zeggen: een patroon of numerieke pincode of wachtwoord), moet je na het versleutelen van je telefoon het scherm ontgrendelen om de telefoon te ontsleutelen wanneer je de telefoon inschakelt. De enige andere manier om de telefoon te ontsleutelen, is door de fabrieksinstellingen terug te zetten waarbij al je gegevens worden gewist.\n\nVersleutelen duurt een uur of langer. Je moet beginnen met een opgeladen batterij en je telefoon moet gedurende het proces zijn aangesloten op een stopcontact. Als je het proces onderbreekt, verlies je een deel van je gegevens of alle gegevens."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"Je kunt je accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden versleutelen. Als je een schermvergrendeling hebt ingesteld (dat wil zeggen: een patroon of numerieke pincode of wachtwoord), moet je na het versleutelen van je telefoon het scherm ontgrendelen om de tablet te ontsleutelen wanneer je de tablet inschakelt. De enige andere manier om de tablet te ontsleutelen is de fabrieksinstellingen terugzetten, waarbij al je gegevens worden gewist.\n\nversleutelen duurt een uur of langer. Je moet beginnen met een opgeladen accu en je telefoon moet gedurende het proces zijn aangesloten op een stopcontact. Als je het proces onderbreekt, verlies je een deel van je gegevens of alle gegevens"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Je kunt je accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden versleutelen. Als je een schermvergrendeling hebt ingesteld (dat wil zeggen: een patroon of numerieke pincode of wachtwoord), moet je na het versleutelen van je telefoon het scherm ontgrendelen om de telefoon te ontsleutelen wanneer je de telefoon inschakelt. De enige andere manier om de telefoon te ontsleutelen, is door de fabrieksinstellingen terug te zetten waarbij al je gegevens worden gewist.\n\nVersleutelen duurt een uur of langer. Je moet beginnen met een opgeladen accu en je telefoon moet gedurende het proces zijn aangesloten op een stopcontact. Als je het proces onderbreekt, verlies je een deel van je gegevens of alle gegevens."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet versleutelen"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefoon versleutelen"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laad de batterij op en probeer het opnieuw."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laad de accu op en probeer het opnieuw."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sluit je lader aan en probeer het opnieuw."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen pincode of wachtwoord voor schermvergrendeling"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Je moet een pincode of wachtwoord voor schermvergrendeling instellen voordat je de encryptie kunt starten."</string>
@@ -449,6 +487,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen dit apparaat zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze telefoon zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Kies je back-upmethode voor schermvergrendeling"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Schermvergrendelingsopties"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Schermvergrendelingsopties"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Schermvergrendeling"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/direct na slaapstand"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> na slaapstand"</string>
@@ -519,13 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ontgrendelingspatroon wijzigen"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pincode voor ontgrendelen wijzigen"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ontgrendelingswachtwoord wijzigen"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Probeer het opnieuw. Poging <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> van <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Laatste poging"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Als je bij deze poging een onjuist patroon voor je werkprofiel opgeeft, worden je werkprofiel en bijbehorende gegevens verwijderd van dit apparaat."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Als je bij deze poging een onjuiste pincode voor je werkprofiel opgeeft, worden je werkprofiel en bijbehorende gegevens verwijderd van dit apparaat."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Als je bij deze poging een onjuist wachtwoord voor je werkprofiel opgeeft, worden je werkprofiel en bijbehorende gegevens verwijderd van dit apparaat."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Te veel onjuiste pogingen. Je werkprofiel en bijbehorende gegevens worden verwijderd van dit apparaat."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Sluiten"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Probeer het opnieuw. Poging <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> van <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Je gegevens worden verwijderd"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Als je bij de volgende poging een onjuist patroon opgeeft, worden de gegevens van dit apparaat verwijderd"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Als je bij de volgende poging een onjuiste pincode opgeeft, worden de gegevens van dit apparaat verwijderd"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Als je bij de volgende poging een onjuist wachtwoord opgeeft, worden de gegevens van dit apparaat verwijderd"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Als je bij de volgende poging een onjuist patroon opgeeft, wordt deze gebruiker verwijderd"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Als je bij de volgende poging een onjuiste pincode opgeeft, wordt deze gebruiker verwijderd"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Als je bij de volgende poging een onjuist wachtwoord opgeeft, wordt deze gebruiker verwijderd"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Als je bij de volgende poging een onjuist patroon opgeeft, worden je werkprofiel en de bijbehorende gegevens verwijderd"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Als je bij de volgende poging een onjuiste pincode opgeeft, worden je werkprofiel en de bijbehorende gegevens verwijderd"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Als je bij de volgende poging een onjuist wachtwoord opgeeft, worden je werkprofiel en de bijbehorende gegevens verwijderd"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Te veel onjuiste pogingen. De gegevens van dit apparaat worden verwijderd."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Te veel onjuiste pogingen. Deze gebruiker worden verwijderd."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Te veel onjuiste pogingen. Dit werkprofiel en de bijbehorende gegevens worden verwijderd."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Sluiten"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Moet ten minste <xliff:g id="COUNT">%d</xliff:g> tekens zijn"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Pincode moet ten minste <xliff:g id="COUNT">%d</xliff:g> cijfers zijn"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Doorgaan"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"De beveiligingsinstelling voor de draadloze router (TKIP) wordt niet ondersteund"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authenticatie is mislukt. Probeer het opnieuw."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Er is een andere WPS-sessie gedetecteerd. Probeer het over een paar minuten opnieuw."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wifi-verbinding verbroken. Instellen van WPS geannuleerd."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Netwerknaam"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Geef de SSID op"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Beveiliging"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Begintijd"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Eindtijd"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Aan / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Scherm activeren wanneer je meldingen ontvangt"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Altijd aan"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Tijd, meldingspictogrammen en andere informatie weergeven"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tekst groter of kleiner maken"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen simkaartvergrendeling"</string>
@@ -1078,7 +1181,7 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Niet beschikbaar"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status van de batterij, het netwerk en andere gegevens"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status van de accu, het netwerk en andere gegevens"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefoonnummer, signaal, enzovoort"</string>
     <string name="storage_settings" msgid="4211799979832404953">"Opslagruimte"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"Opslag"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-kaart wissen"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Alle gegevens in de interne USB-opslag wissen, zoals muziek en foto\'s"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Alle gegevens op de SD-kaart wissen, zoals muziek en foto\'s"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"E-simkaarten wissen"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Alle e-simkaarten op de telefoon wissen. Hierdoor wordt je mobiele abonnement niet opgezegd."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Alle e-simkaarten op de tablet wissen. Hierdoor wordt je mobiele abonnement niet opgezegd."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet resetten"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefoon resetten"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Al je persoonlijke gegevens en gedownloade apps verwijderen? Je kunt deze actie niet ongedaan maken."</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Wordt uitgevoerd"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-opslag"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
+    <string name="disabled" msgid="9206776641295849915">"Uitgeschakeld"</string>
     <string name="not_installed" msgid="2797554494953450291">"Niet geïnstalleerd voor deze gebruiker"</string>
     <string name="installed" msgid="3070865169422600098">"Geïnstalleerd"</string>
     <string name="no_applications" msgid="7336588977497084921">"Geen apps."</string>
@@ -1608,7 +1716,7 @@
     <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Als je deze app uitschakelt, werken Android en andere apps mogelijk niet meer zoals bedoeld. Je gegevens worden ook verwijderd."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Meldingen uitschakelen?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Als je meldingen voor deze app uitschakelt, mis je misschien belangrijke waarschuwingen en updates."</string>
-    <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
+    <string name="app_install_details_group_title" msgid="7084623031296083574">"Winkel"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"App-details"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"App geïnstalleerd vanuit <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"Meer informatie via <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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>
@@ -1898,11 +2015,11 @@
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"Zoekvak verborgen"</string>
     <string name="printer_info_desc" msgid="5824995108703060003">"Meer informatie over deze printer"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterij"</string>
-    <string name="power_usage_summary" msgid="7237084831082848168">"Waarvoor de batterij is gebruikt"</string>
-    <string name="power_usage_not_available" msgid="3109326074656512387">"Batterijgebruikgegevens niet beschikbaar."</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Waarvoor de accu is gebruikt"</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Accugebruikgegevens niet beschikbaar."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
-    <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> tot batterij leeg is"</string>
-    <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> tot batterij is opgeladen"</string>
+    <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> tot accu leeg is"</string>
+    <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> tot accu is opgeladen"</string>
     <string name="background_activity_title" msgid="8618384801540759730">"Achtergrondactiviteit"</string>
     <string name="background_activity_summary" msgid="8140094430510517362">"Toestaan dat de app wordt uitgevoerd op de achtergrond"</string>
     <string name="background_activity_summary_on" msgid="649282072540085599">"App kan op de achtergrond worden uitgevoerd wanneer deze niet wordt gebruikt"</string>
@@ -1918,7 +2035,7 @@
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Apparaatgebruik sinds volledige lading"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Accugebruik sinds losgekoppeld"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Accugebruik sinds herstel"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> op batterij"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> op accu"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> sinds losgekoppeld"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Opladen"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Scherm aan"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Scherm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Zaklamp"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -1972,7 +2130,7 @@
     <string name="usage_type_flashlight" msgid="1516392356962208230">"Zaklamp"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tijd actief"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tijd zonder signaal"</string>
-    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Totale capaciteit van de batterij"</string>
+    <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Totale capaciteit van de accu"</string>
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Berekend stroomverbruik"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Waargenomen stroomverbruik"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Gedwongen stoppen"</string>
@@ -1981,30 +2139,32 @@
     <string name="battery_action_display" msgid="7338551244519110831">"Scherminstellingen"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Wifi-instellingen"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-instellingen"</string>
-    <string name="battery_desc_voice" msgid="8980322055722959211">"Batterij gebruikt door spraakoproepen"</string>
-    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batterij gebruikt wanneer tablet inactief is"</string>
-    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batterij gebruikt wanneer telefoon inactief is"</string>
-    <string name="battery_desc_radio" msgid="5479196477223185367">"Batterij gebruikt door radio"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Accu gebruikt door spraakoproepen"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Accu gebruikt wanneer tablet inactief is"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Accu gebruikt wanneer telefoon inactief is"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Accu gebruikt door radio"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Schakel over naar de vliegtuigmodus om energie te besparen in gebieden zonder mobiel bereik"</string>
-    <string name="battery_desc_flashlight" msgid="2908579430841025494">"Batterij gebruikt door de zaklamp"</string>
+    <string name="battery_desc_flashlight" msgid="2908579430841025494">"Accu gebruikt door de zaklamp"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"Accugebruik door de camera"</string>
-    <string name="battery_desc_display" msgid="5432795282958076557">"Batterij gebruikt door scherm en achtergrondverlichting"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Accu gebruikt door scherm en achtergrondverlichting"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Verlaag de helderheid van het scherm en/of geef een kortere time-out voor het scherm op"</string>
-    <string name="battery_desc_wifi" msgid="2375567464707394131">"Batterij gebruikt door wifi"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Accu gebruikt door wifi"</string>
     <string name="battery_sugg_wifi" msgid="7776093125855397043">"Schakel wifi uit wanneer je dit niet gebruikt of wanneer dit niet beschikbaar is"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Batterij gebruikt door Bluetooth"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Accu gebruikt door Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Schakel Bluetooth uit wanneer je deze functie niet gebruikt"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Probeer verbinding te maken met een ander Bluetooth-apparaat"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"Batterij gebruikt door app"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"Accu gebruikt door app"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"De app stoppen of verwijderen"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Accubesparingsmodus selecteren"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"De app kan instellingen aanbieden om het accugebruik te beperken"</string>
-    <string name="battery_desc_users" msgid="7682989161885027823">"Batterij gebruikt door gebruiker"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Accu gebruikt door gebruiker"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"Divers stroomgebruik"</string>
-    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Batterijgebruik is een schatting van het stroomgebruik en omvat niet elke bron van batterijverbruik. Divers is het verschil tussen het berekende, geschatte stroomgebruik en het werkelijke verbruik dat is waargenomen voor de batterij."</string>
+    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Accugebruik is een schatting van het stroomgebruik en omvat niet elke bron van accuverbruik. Divers is het verschil tussen het berekende, geschatte stroomgebruik en het werkelijke verbruik dat is waargenomen voor de accu."</string>
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2571,7 +2731,7 @@
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Meldingen over groot gevaar voor levens en eigendommen"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Groot gevaar"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"Meldingen ontv. bij groot gevaar voor levens en eigendommen"</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER Alerts"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER-alerts"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Berichten ontvangen over ontvoerde kinderen"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Herhalen"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"Oproepbeheer inschakelen"</string>
@@ -2654,25 +2814,28 @@
       <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="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Rechten, standaard-apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Gebruikers en accounts"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Standaard-apps"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Talen, tijd, back-up, updates"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Instellingen"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Zoeken in de instellingen"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Zoeken in de instellingen"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Zoekinstellingen"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Zoekinstellingen"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, netwerkverbinding"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tekst bericht, tekstbericht, sms, sms\'en, berichten, verzenden, sturen"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiel, gsm, provider, draadloos, gegevens, data, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, oproep, gesprek, bellen, gebeld"</string>
     <string name="keywords_home" msgid="3626170808219458848">"launcher"</string>
     <string name="keywords_display" msgid="8910345814565493016">"scherm, touchscreen"</string>
-    <string name="keywords_display_brightness_level" msgid="3891383826236015854">"scherm dimmen, touchscreen, batterij"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"scherm dimmen, touchscreen, batterij"</string>
+    <string name="keywords_display_brightness_level" msgid="3891383826236015854">"scherm dimmen, touchscreen, accu"</string>
+    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"scherm dimmen, touchscreen, accu"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"scherm dimmen, nacht, tint"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"achtergrond, personaliseren, weergave aanpassen"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"tekstgrootte"</string>
@@ -2698,7 +2861,7 @@
     <string name="keywords_emergency_app" msgid="3143078441279044780">"noodgeval, ice, app, standaard"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"telefoon, kiezer, standaard"</string>
     <string name="keywords_all_apps" msgid="7814015440655563156">"apps, download, downloaden, applicaties, systeem"</string>
-    <string name="keywords_app_permissions" msgid="4229936435938011023">"apps, machtigingen, beveiliging"</string>
+    <string name="keywords_app_permissions" msgid="4229936435938011023">"apps, machtigingen, rechten, beveiliging"</string>
     <string name="keywords_default_apps" msgid="223872637509160136">"apps, standaard"</string>
     <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"optimalisaties negeren, sluimeren, stand-by voor apps"</string>
     <string name="keywords_color_mode" msgid="6362744316886077510">"levendig, RGB, sRGB, kleur, natuurlijk, standaard"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gebaar"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betalen, tikken, betalingen"</string>
     <string name="keywords_backup" msgid="470070289135403022">"back-up, back-up maken, back-uppen"</string>
+    <!-- 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">"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>
@@ -2827,14 +2996,12 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Wanneer VR-modus van apparaat is geactiveerd"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Vervaging beperken (aanbevolen)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Flikkering beperken"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Scherm-in-scherm"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Geen geïnstalleerde apps die Scherm-in-scherm ondersteunen"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Beeld-in-beeld"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Geen geïnstalleerde apps die Beeld-in-beeld ondersteunen"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture beeld in"</string>
-    <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="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Beeld-in-beeld"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Beeld-in-beeld toestaan"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Geef deze app toestemming om een beeld-in-beeldvenster te maken als de app open is of als je de app verlaat (bijvoorbeeld om een video te blijven kijken). Dit venster wordt weergegeven vóór andere apps die je gebruikt."</string>
     <string name="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>
@@ -2965,11 +3132,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 +3139,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>
@@ -3020,15 +3182,15 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> machtiging verleend</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
-      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> van <xliff:g id="COUNT_3">%d</xliff:g> machtigingen verleend</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> machtiging verleend</item>
+      <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> van <xliff:g id="COUNT_3">%d</xliff:g> rechten verleend</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> recht verleend</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aanvullende machtigingen</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aanvullend machtiging</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aanvullende rechten</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aanvullend recht</item>
     </plurals>
-    <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Geen machtigingen verleend"</string>
-    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Geen machtigingen aangevraagd"</string>
+    <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Geen rechten verleend"</string>
+    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Geen rechten aangevraagd"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Alle apps"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"Geïnstalleerde apps"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"Instant-apps"</string>
@@ -3095,19 +3257,25 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
     <string name="high_power_system" msgid="7362862974428225301">"Batterijoptimalisatie niet beschikbaar"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Batterijoptimalisatie niet toepassen. Hierdoor kan je batterijverbruik toenemen."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"App altijd uitvoeren op de achtergrond?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"Als je toestaat dat <xliff:g id="APP_NAME">%1$s</xliff:g> altijd op de achtergrond wordt uitgevoerd, kan de batterij sneller leeg raken. \n\nJe kunt dit later wijzigen via Instellingen &gt; Apps en meldingen."</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Als je toestaat dat <xliff:g id="APP_NAME">%1$s</xliff:g> altijd op de achtergrond wordt uitgevoerd, kan de batterij sneller leeg raken. \n\nJe kunt dit later wijzigen via \'Instellingen\' &gt; \'Apps en meldingen\'."</string>
     <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> gebruik sinds laatste volledige lading"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Energiebeheer"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Geen accugebruik sinds laatste volledige lading"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"App-instellingen"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner weergeven"</string>
-    <string name="additional_permissions" msgid="6463784193877056080">"Aanvullende machtigingen"</string>
+    <string name="additional_permissions" msgid="6463784193877056080">"Aanvullende rechten"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"Nog <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"Bugrapport delen?"</string>
     <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"Je IT-beheerder heeft een bugrapport aangevraagd om problemen met dit apparaat op te lossen. Apps en gegevens kunnen worden gedeeld."</string>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Onbekende apps installeren"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"App-machtigingen voor aanpassen van systeeminstellingen"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Aanpassen van systeeminstellingen toestaan"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Met deze rechten kan een app de systeeminstellingen aanpassen."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Toestaan van deze bron"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Twee keer draaien voor camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open de camera-app door je pols twee keer te draaien"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">1 app mag onbeperkt data gebruiken terwijl Databesparing is ingeschakeld</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Databesparing"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Onbeperkte datatoegang"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Onbeperkte gegevens"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Achtergrondgegevens zijn uitgeschakeld"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aan"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Uit"</string>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisch"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Handmatig"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Nu ruimte vrijmaken"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gebaren"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Snelkoppelingsgebaren"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Snelle gebaren om je telefoon te bedienen"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Snelle gebaren om je tablet te bedienen"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Snelle gebaren om je apparaat te bedienen"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Naar camera schakelen"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Als je de camera snel wilt openen, tik je twee keer op de aan/uit-knop. Werkt vanuit elk scherm."</string>
+    <!-- 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">"Schakelen tussen camera\'s"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Optillen om camera te openen"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Als je de camera automatisch wilt openen, houd je je telefoon vast alsof je een foto wilt maken (liggende of staande apparaatstand). Dit werkt wanneer je telefoon in de slaapstand staat of is vergrendeld."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Maak foto\'s in de slaapstand of met vergrendelde telefoon"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gebaar voor assistent-app"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Gevoeligheid"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-pa/arrays.xml b/res/values-pa/arrays.xml
index 9764754..bc69218 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ਵਧੀਆ"</item>
     <item msgid="8986346415847956850">"ਸ਼ਾਨਦਾਰ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ਹਮੇਸ਼ਾਂ"</item>
-    <item msgid="844721238536786870">"ਕੇਵਲ ਉਦੋਂ ਜਦੋਂ ਪਲਗ ਇਨ ਕੀਤਾ ਹੋਵੇ"</item>
-    <item msgid="1986753720941888596">"ਕਦੇ ਵੀ ਨਹੀਂ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ਹਮੇਸ਼ਾਂ"</item>
-    <item msgid="7433294150916905997">"ਕੇਵਲ ਉਦੋਂ ਜਦੋਂ ਪਲਗ ਇਨ ਕੀਤਾ ਹੋਵੇ"</item>
-    <item msgid="1390404486722375028">"ਕਦੇ ਵੀ ਨਹੀਂ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"ਪਿਛਲੇ 30 ਦਿਨ"</item>
     <item msgid="6600989128423965319">"ਵਰਤੋਂ ਸਾਈਕਲ ਸੈੱਟ ਕਰੋ..."</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 522621e..9cdc587 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -23,13 +23,13 @@
     <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="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="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 +41,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,23 +107,40 @@
     <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">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦਿਖਣਯੋਗ ਹੁੰਦਾ ਹੈ ਜਦੋਂ Bluetooth ਸੈਟਿੰਗਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"</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>
     <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">"ਬਿਨਾਂ ਨਾਮ ਦਿੱਤੀ Bluetooth ਡੀਵਾਈਸ"</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_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>
+    <!-- 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> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</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>
@@ -156,7 +174,12 @@
     <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_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>
+    <!-- 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) -->
@@ -202,7 +225,7 @@
     <string name="radio_info_phone_number_label" msgid="7942153178953255231">"ਫ਼ੋਨ ਨੰਬਰ:"</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_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>
@@ -278,17 +301,17 @@
     <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="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_reenable_message" msgid="9141007271031717369">"ਤੁਹਾਡੀ ਡਾਟਾ ਕਨੈਕਟੀਵਿਟੀ ਨਸ਼ਟ ਹੋ ਗਈ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਡਾਟਾ ਰੋਮਿੰਗ ਬੰਦ ਨਾਲ ਆਪਣਾ ਹੋਮ ਨੈੱਟਵਰਕ ਛੱਡ ਦਿੱਤਾ ਸੀ।"</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_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>
@@ -318,7 +341,7 @@
     <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_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>
@@ -329,10 +352,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>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"ਡੀਵਾਈਸ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ"</string>
+    <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>
@@ -353,41 +377,56 @@
     <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ਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ 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>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"ਡੀਵਾਈਸ ਵਾਲੀ ਤਸਵੀਰ ਅਤੇ ਫ਼ਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਟਿਕਾਣਾ"</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>
@@ -408,14 +447,14 @@
     <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">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ, ਸੈਟਿੰਗਾਂ. ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ ਅਤੇ ਉਹਨਾਂ ਦਾ ਡੈਟਾ, ਮੀਡੀਆ ਅਤੇ ਹੋਰ ਫਾਈਲਾਂ ਇਨਕ੍ਰਿਪਟ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੀ ਟੈਬਲੇਟ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ ਮੰਨਦੇ ਹੋਏ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕੀਤਾ ਹੈ (ਮਤਲਬ, ਇੱਕ ਪੈਟਰਨ ਜਾਂ ਸੰਖਿਆਤਮਿਕ PIN ਜਾਂ ਪਾਸਵਰਡ), ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਟੈਬਲੇਟ ਨੂੰ ਚਾਲੂ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਦਾ ਹੋਰ ਤਰੀਕਾ ਕੇਵਲ ਆਪਣਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਉਂਦੇ ਹੋਏ, ਇੱਕ ਫੈਕਟਰੀ ਡੈਟਾ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।\n\nਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇੱਕ ਚਾਰਜ ਕੀਤੀ ਬੈਟਰੀ ਨਾਲ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਪੂਰੀ ਪ੍ਰਕਿਰਿਆ ਦੇ ਦੌਰਾਨ ਆਪਣੀ ਟੈਬਲੇਟ ਨੂੰ ਪਲਗ ਇਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕੁਝ ਜਾਂ ਸਾਰਾ ਡੈਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ, ਸੈਟਿੰਗਾਂ. ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ ਅਤੇ ਉਹਨਾਂ ਦਾ ਡੈਟਾ, ਮੀਡੀਆ ਅਤੇ ਹੋਰ ਫਾਈਲਾਂ ਇਨਕ੍ਰਿਪਟ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੇ ਫੋਨ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ ਮੰਨਦੇ ਹੋਏ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕੀਤਾ ਹੈ (ਮਤਲਬ, ਇੱਕ ਪੈਟਰਨ ਜਾਂ ਸੰਖਿਆਤਮਿਕ PIN ਜਾਂ ਪਾਸਵਰਡ), ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਫੋਨ ਨੂੰ ਚਾਲੂ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਦਾ ਹੋਰ ਤਰੀਕਾ ਕੇਵਲ ਆਪਣਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਉਂਦੇ ਹੋਏ, ਇੱਕ ਫੈਕਟਰੀ ਡੈਟਾ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।\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_dialog_need_password_title" msgid="4058971800557767">"ਕੋਈ ਲੌਕ ਸਕ੍ਰੀਨ PIN ਜਾਂ ਪਾਸਵਰਡ ਨਹੀਂ"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ਤੁਹਾਨੂੰ ਇਨਕ੍ਰਿਪਸ਼ਨ ਸ਼ੁਰੂ ਸਕਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲੌਕ ਸਕ੍ਰੀਨ PIN ਜਾਂ ਪਾਸਵਰਡ ਸੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</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>
@@ -426,7 +465,7 @@
     <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>
@@ -436,25 +475,27 @@
     <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>
     <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_change_summary" msgid="2790960639554590668">"ਪੈਟਰਨ, PIN ਜਾਂ ਪਾਸਵਰਡ ਸੁਰੱਖਿਆ ਬਦਲੋ ਜਾਂ ਅਸਮਰੱਥ ਬਣਾਓ"</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>
@@ -462,14 +503,14 @@
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"ਕੋਈ ਸੁਰੱਖਿਆ ਨਹੀਂ"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"ਪੈਟਰਨ"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"ਦਰਮਿਆਨੀ ਸੁਰੱਖਿਆ"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"ਪਿੰਨ"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <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="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_pin" msgid="8010746824051056986">"ਫਿੰਗਰਪ੍ਰਿੰਟ + PIN"</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>
@@ -477,36 +518,36 @@
     <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_pin" msgid="3541326261341386690">"PIN"</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_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">
+</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">
 
-</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">
+</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">
 
 </xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੀ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।\""</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">
+    <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>
+</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">
 
@@ -517,22 +558,30 @@
 </xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੀ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।\""</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_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="TOTAL_ATTEMPTS">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ਕੋਸ਼ਿਸ਼।"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ਤੁਹਾਡਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕਿਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕਿਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ PIN ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕਿਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕਿਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕਿਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ PIN ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕਿਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕਿਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕਿਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ PIN ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕਿਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਸ ਡੀਵਾਈਸ ਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ਬਹੁਤ ਸਾਰੀਆਂ ਗਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਸ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਇਸਦਾ ਡੈਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ਖਾਰਜ ਕਰੋ"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ਘੱਟੋ-ਘੱਟ <xliff:g id="COUNT">%d</xliff:g> ਅੱਖਰ-ਚਿੰਨ੍ਹਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
-    <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ਪਿੰਨ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ <xliff:g id="COUNT">%d</xliff:g> ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
+    <string name="lockpassword_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="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">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਇੱਕ ਹਾਲੀਆ 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>
@@ -585,14 +634,14 @@
     <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_settings_summary" msgid="2091062709530570462">"ਕਨੈਕਸ਼ਨ ਵਿਵਸਥਿਤ ਕਰੋ, ਡੀਵਾਈਸ ਨਾਮ ਅਤੇ ਖੋਜਯੋਗਤਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ਕਨੈਕਸ਼ਨ ਵਿਵਸਥਿਤ ਕਰੋ, ਡੀਵਾਈਸ ਨਾਮ &amp; ਖੋਜਯੋਗਤਾ ਸੈੱਟ ਕਰੋ"</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_enable_alphanumeric_pin" msgid="7222713483058171357">"ਪਿੰਨ ਵਿੱਚ ਅੱਖਰ ਜਾਂ ਚਿੰਨ੍ਹ ਹਨ"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN ਵਿੱਚ ਅੱਖਰ ਜਾਂ ਚਿੰਨ੍ਹ ਹਨ"</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_pin_other_device" msgid="4637977124526813470">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਇਹ PIN ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</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>
@@ -604,7 +653,7 @@
     <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_keyboard_option" msgid="2271954176947879628">"ਕੀ-ਬੋਰਡ"</string>
@@ -624,23 +673,39 @@
     <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">"ਜਦੋਂ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਹੋਰਾਂ ਨੇੜਲਿਆਂ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸੰਚਾਰ ਕਰ ਸਕਦਾ ਹੈ।"</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>
+    <!-- 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>
-    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<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_device_advanced_title" msgid="6066342531927499308">"ਪੇਅਰ ਕੀਤੀ Bluetooth ਡੀਵਾਈਸ"</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">"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_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>
@@ -664,16 +729,16 @@
     <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="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">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -709,7 +774,7 @@
     <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_cellular_data_fallback_summary" msgid="6375399280719867214">"ਵਾਈ‑ਫਾਈ ਦੀ ਇੰਟਰਨੈੱਟ \'ਤੇ ਪਹੁੰਚ ਨਾ ਹੋਣ \'ਤੇ ਮੋਬਾਈਲ ਡਾਟਾ ਵਰਤੋ। ਡਾਟਾ ਵਰਤੋਂ ਵਾਸਤੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</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>
@@ -717,7 +782,7 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi ਨੈੱਟਵਰਕ"</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_wps_pin" msgid="6426448256268695933">"WPS Pin ਐਂਟਰੀ"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ਡਾਇਰੈਕਟ"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ਸਕੈਨ ਕਰੋ"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ਉੱਨਤ"</string>
@@ -738,7 +803,7 @@
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi ਸੁਰੱਖਿਅਤ ਸੈਟਅਪ"</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_pin" msgid="223344506445335358">"ਆਪਣੇ ਵਾਈ‑ਫਾਈ ਰੂਟਰ \'ਤੇ ਪਿੰਨ <xliff:g id="NUMBER">%1$s</xliff:g> ਦਾਖਲ ਕਰੋ। ਸੈੱਟਅੱਪ ਨੂੰ ਪੂਰਾ ਹੋਣ ਵਿੱਚ ਦੋ ਮਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ।"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"ਆਪਣੇ Wi‑Fi ਰੂਟਰ ਤੇ pin <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_in_progress" msgid="3372311348221357944">"WPS ਪਹਿਲਾਂ ਹੀ ਚਾਲੂ ਹੈ ਅਤੇ ਪੂਰਾ ਕਰਨ ਵਿੱਚ ਦੋ ਮਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ"</string>
@@ -747,7 +812,6 @@
     <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_ssid" msgid="5519636102673067319">"ਨੈੱਟਵਰਕ ਦਾ ਨਾਮ"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID ਦਾਖਲ ਕਰੋ"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ਸੁਰੱਖਿਆ"</string>
@@ -793,7 +857,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>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"ਜਦੋਂ ਵੀ ਵਾਈ-ਫਾਈ ਕਨੈਕਸ਼ਨ ਖਰਾਬ ਹੋਵੇ ਤਾਂ ਤੁਸੀਂ ਬਦਲੀ ਕਰਕੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਜਾ ਸਕਦੇ ਹੋ। ਡਾਟਾ ਵਰਤੋਂ ਦੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+    <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>
@@ -810,7 +874,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>
@@ -834,7 +897,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">"ਪੀਅਰ ਡਿਵਾਈਸਾਂ"</string>
     <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"ਯਾਦ ਰੱਖੇ ਗਏ ਸਮੂਹ"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8491862096448192157">"ਕਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
@@ -847,9 +910,28 @@
     <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>
+    <!-- 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_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">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</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>
@@ -859,11 +941,11 @@
     <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_settings_title" msgid="4102921303993404577">"Wi-Fi ਕਾਲਿੰਗ"</string>
+    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi ਕਾਲਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਥਾਂ Wi-Fi ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"ਕਾਲਿੰਗ ਤਰਜੀਹ"</string>
-    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਮੋਡ"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi ਕਾਲਿੰਗ ਮੋਡ"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"ਰੋਮਿੰਗ ਤਰਜੀਹ"</string>
     <!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
     <skip />
@@ -895,8 +977,9 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ਜਦੋਂ ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਚਾਲੂ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਫੋਨ ਤੁਹਾਡੀ ਤਰਜੀਹ ਅਤੇ ਕਿਹੜਾ ਸਿਗਨਲ ਵੱਧ ਮਜ਼ਬੂਤ ਹੈ, ਦੇ ਆਧਾਰ ਤੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਜਾਂ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦੇ ਨੈੱਟਵਰਕ ਰਾਹੀ ਕਾਲਾਂ ਰੂਟ ਕਰ ਸਕਦਾ ਹੈ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਫੀਸ ਅਤੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
-    <string name="emergency_address_title" msgid="3571902448699714454">"ਸੰਕਟਕਾਲੀਨ ਪਤਾ ਅੱਪਡੇਟ ਕਰੋ"</string>
+    <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>
     <string name="sound_settings" msgid="5534671337768745343">"ਧੁਨੀ"</string>
@@ -980,23 +1063,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1113,19 @@
     <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>
+    <!-- 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>
@@ -1030,23 +1134,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">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</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="default" msgid="258981978215428916">"ਫ਼ੋਨ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"ਸਿਮ ਪਿੰਨ ਬਦਲੋ"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"ਸਿਮ ਪਿੰਨ"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ PIN ਦੀ ਲੋੜ ਹੈ"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ਫੋਨ ਵਰਤਣ ਲਈ PIN ਲੋੜੀਂਦਾ ਬਣਾਓ"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ PIN ਦੀ ਲੋੜ ਹੈ"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ਫੋਨ ਵਰਤਣ ਲਈ PIN ਲੋੜੀਂਦਾ ਬਣਾਓ"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"SIM PIN ਬਦਲੋ"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</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">"ਪੁਰਾਣਾ ਸਿਮ ਪਿੰਨ"</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_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_old" msgid="6074196344494634348">"ਪੁਰਾਣਾ SIM PIN"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"ਨਵਾਂ SIM PIN"</string>
+    <string name="sim_reenter_new" msgid="6523819386793546888">"ਨਵਾਂ PIN ਮੁੜ-ਟਾਈਪ ਕਰੋ"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</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ਸ਼ਾਇਦ PI ਗ਼ਲਤ ਹੈ।"</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN ਸਫਲਤਾਪੂਰਵਕ ਬਦਲਿਆ ਗਿਆ"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"SIM ਕਾਰਡ ਲੌਕ ਸਥਿਤੀ ਨਹੀਂ ਬਦਲ ਸਕਦਾ।\nਸੰਭਾਵਿਤ ਰੂਪ ਨਾਲ ਗ਼ਲਤ PIN."</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>
@@ -1054,13 +1158,13 @@
     <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_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> SIM ਹੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ SIM ਨੂੰ ਮੋਬਾਈਲ ਡੈਟੇ, ਕਾਲਾਂ, ਅਤੇ SMS ਸੁਨੇਹਿਆਂ ਦੇ ਲਈ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ਗ਼ਲਤ SIM PIN ਕੋਡ, ਹੁਣ ਤੁਹਾਨੂੰ ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰਨਾ ਪਵੇਗਾ।"</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">ਗ਼ਲਤ SIM PIN ਕੋਡ, ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ਾਂ ਬਾਕੀ ਹਨ।</item>
+      <item quantity="other">ਗ਼ਲਤ SIM PIN ਕੋਡ, ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ਾਂ ਬਾਕੀ ਹਨ।</item>
     </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"ਸਿਮ ਪਿੰਨ ਕਾਰਵਾਈ ਅਸਫਲ ਰਹੀ!"</string>
+    <string name="pin_failed" msgid="1848423634948587645">"SIM PIN ਓਪਰੇਸ਼ਨ ਅਸਫਲ!"</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>
@@ -1071,7 +1175,7 @@
     <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="baseband_version" msgid="1848990160763524801">"ਬੇਸਬੈਂਡ ਵਰਜਨ"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"ਬੇਸਬੈਂਡ ਰੂਪ"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel ਰੂਪ"</string>
     <string name="build_number" msgid="3075795840572241758">"ਬਿਲਡ ਨੰਬਰ"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux ਸਥਿਤੀ"</string>
@@ -1186,10 +1290,10 @@
     <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_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_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>
@@ -1207,9 +1311,9 @@
     <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_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_body" msgid="4401758710076806509">"ਇਸਨੂੰ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਸੁਰੱਖਿਅਤ ਬਣਾਉਣ ਲਈ ਇਹ ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ. \n\nਫਾਰਮੈਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ <xliff:g id="NAME_1">^1</xliff:g> will ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਕੰਮ ਕਰੇਗਾ. \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>
@@ -1226,11 +1330,11 @@
     <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_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_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_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>
@@ -1273,6 +1377,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ਨੂੰ ਖਾਲੀ ਨਹੀਂ ਛੱਡਿਆ ਜਾ ਸਕਦਾ।"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ਖੇਤਰ 3 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ਖੇਤਰ 2 ਜਾਂ 3 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"ਕੈਰੀਅਰ %s ਦੇ APNs ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦਾ।"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"ਪੂਰਵ-ਨਿਰਧਾਰਤ APN ਸੈਟਿੰਗਾਂ ਰੀਸਟੋਰ ਕਰ ਰਿਹਾ ਹੈ।"</string>
     <string name="menu_restore" msgid="8260067415075573273">"ਡਿਫੌਲਟਸ ਤੇ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ਪੂਰਵ-ਨਿਰਧਾਰਤ APN ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ।"</string>
@@ -1285,7 +1390,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="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ਖਾਤਾ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਵੇਗਾ</item>
       <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ਖਾਤੇ ਰੀਸੈੱਟ ਕੀਤੇ ਜਾਣਗੇ</item>
@@ -1294,7 +1399,7 @@
     <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_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>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਤੇ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs ਨੂੰ ਮਿਟਾਓ"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ਫ਼ੋਨ ਵਿੱਚੋਂ ਸਾਰੇ eSIMs ਨੂੰ ਮਿਟਾਓ। ਅਜਿਹਾ ਕਰਨਾ ਤੁਹਾਡੀ ਮੋਬਾਈਲ ਸੇਵਾ ਯੋਜਨਾ ਨੂੰ ਰੱਦ ਨਹੀਂ ਕਰੇਗਾ।"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ਟੈਬਲੈੱਟ ਵਿੱਚੋਂ ਸਾਰੇ eSIMs ਨੂੰ ਮਿਟਾਓ। ਇਹ ਤੁਹਾਡੀ ਮੋਬਾਈਲ ਸੇਵਾ ਯੋਜਨਾ ਨੂੰ ਰੱਦ ਨਹੀਂ ਕਰੇਗਾ।"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ਟੈਬਲੇਟ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ਫੋਨ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"ਕੀ ਆਪਣੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਅਤੇ ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ ਮਿਟਾਉਣੇ ਹਨ? ਤੁਸੀਂ ਇਹ ਕਿਰਿਆ ਅਨਡੂ ਨਹੀਂ ਕਰ ਸਕਦੇ!"</string>
@@ -1312,7 +1420,7 @@
     <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">"ਵੌਇਸਮੇਲ, ਕਾਲ ਫਾਰਵਰਡਿੰਗ, ਕਾਲ ਵੇਟਿੰਗ, ਕਾਲਰ 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>
@@ -1321,29 +1429,23 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1353,7 +1455,7 @@
     <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>
-    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"ਕੀ ਵਾਈ‑ਫਾਈ ਸਹਾਇਕ ਬਦਲਣਾ ਹੈ?"</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="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>
@@ -1376,7 +1478,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>
@@ -1398,7 +1500,7 @@
     <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="emulator" msgid="221313099578564438">"ਇਮੂਲੇਟ ਕੀਤੇ ਡੀਵਾਈਸ ਬਾਰੇ"</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>
     <string name="contributors_title" msgid="5917703088825286504">"ਸਹਿਯੋਗੀ"</string>
@@ -1422,34 +1524,34 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"ਆਪਣਾ ਪਾਸਵਰਡ ਚੁਣੋ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"ਆਪਣਾ ਪੈਟਰਨ ਚੁਣੋ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ਆਪਣਾ ਪਿੰਨ ਚੁਣੋ"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"ਆਪਣਾ PIN ਚੁਣੋ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ਆਪਣੇ ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ਆਪਣੇ PIN ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
-    <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
+    <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">"ਪਿੰਨ ਸੈੱਟ ਹੋ ਗਿਆ ਹੈ"</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">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੇ ਡੀਵਾਈਸ ਦਾ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਡੀਵਾਈਸ ਦਾ ਪੈਟਰਨ ਵਰਤੋ"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਡੀਵਾਈਸ ਦਾ PIN ਦਾਖਲ ਕਰੋ"</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_pin_generic_profile" msgid="3730141667547002246">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ PIN ਦਾਖਲ ਕਰੋ"</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_pattern" msgid="8548464672947477043">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਡੀਵਾਈਸ ਵੰਨਗੀ ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦੀ ਹੈ।"</string>
+    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਡੀਵਾਈਸ PIN ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦਾ ਹੈ।"</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_pattern" msgid="7462071286473121099">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਕੰਮ ਸਬੰਧੀ ਵੰਨਗੀ ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦੀ ਹੈ।"</string>
+    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ PIN ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦਾ ਹੈ।"</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_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="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"ਅਨਲੌਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ਅਨਲੌਕ ਪਿੰਨ ਬਦਲੋ"</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_footer" msgid="1118579101409152113">"ਮਦਦ ਲਈ ਮੀਨੂ ਦਬਾਓ।"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ਜਦੋਂ ਹੋ ਜਾਏ ਤਾਂ ਉਂਗਲ ਹਟਾਓ"</string>
@@ -1477,10 +1579,10 @@
     <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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1658,7 @@
     <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="default" msgid="1477351142334784771">"SD ਕਾਰਡ ਤੇ"</string>
+    <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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ਇਨਪੁੱਟ ਸਹਾਇਤਾ"</string>
@@ -1782,7 +1896,7 @@
     <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_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>
@@ -1854,10 +1968,10 @@
     <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_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_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">"ਤੁਹਾਡੀਆਂ ਸਰਗਰਮੀਆਂ ਦਾ ਨਿਰੀਖਣ ਕਰਨਾ"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"ਜਦੋਂ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਨਾਲ ਅੰਤਰਕਿਰਿਆ ਕਰ ਰਹੇ ਹੋਵੋ ਤਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰਨਾ।"</string>
@@ -1873,6 +1987,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>
@@ -1930,7 +2048,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">"Wi‑Fi ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"ਉੱਨਤ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
@@ -1939,6 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"CPU ਕੁੱਲ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ਫੋਰਗ੍ਰਾਉਂਡ"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ਸਕਿਰਿਆ ਰੱਖੋ"</string>
@@ -1994,7 +2153,7 @@
     <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">"ਇੱਕ ਵੱਖਰੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ਇੱਕ ਵੱਖਰੀ Bluetooth ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ"</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,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2032,7 +2193,7 @@
     <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>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"ਅਵਸਥਾ ਪੱਟੀ ਵਿੱਚ ਬੈਟਰੀ ਪ੍ਰਤੀਸ਼ਤ ਦਿਖਾਓ"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"ਪ੍ਰਕਿਰਿਆ ਸਟੈਟਸ"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"ਚੱਲ ਰਹੀਆਂ ਪ੍ਰਕਿਰਿਆਵਾਂ ਬਾਰੇ Geeky ਸਟੈਟਸ"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"ਮੈਮਰੀ ਵਰਤੋਂ"</string>
@@ -2142,7 +2303,7 @@
     <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_configure_lock_screen_hint" msgid="6757119179588664966">"ਤੁਹਾਨੂੰ ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵਰਤ ਸਕਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲੌਕ ਸਕ੍ਰੀਨ PIN ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</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>
@@ -2159,8 +2320,8 @@
     <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="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="4960761799560705902">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਸੈਟਿੰਗਾਂ"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"ਇਸ ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ"</string>
@@ -2177,7 +2338,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>
@@ -2229,7 +2390,7 @@
     <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>
@@ -2265,11 +2426,11 @@
     <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_pin" msgid="5305333588093263790">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ PIN ਦਾਖਲ ਕਰੋ"</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_pin" msgid="755720788765259382">"ਗ਼ਲਤ PIN"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android ਨੂੰ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="delete" msgid="4219243412325163003">"ਮਿਟਾਓ"</string>
@@ -2277,16 +2438,16 @@
     <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_cycle" msgid="5652529796195787949">"ਡਾਟਾ ਵਰਤੋਂ ਸਾਈਕਲ"</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>
@@ -2303,7 +2464,7 @@
     <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_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>
@@ -2330,7 +2491,7 @@
     <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_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>
@@ -2340,11 +2501,11 @@
     <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_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_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>
@@ -2355,14 +2516,14 @@
     <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_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_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>
@@ -2420,7 +2581,7 @@
     <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" 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_none" msgid="9214462857336483711">"ਕੋਈ ਨਹੀਂ"</string>
@@ -2463,14 +2624,14 @@
       <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>
     </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,7 +2656,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">"ਤੁਸੀਂ ਵਾਧੂ ਉਪਭੋਗਤਾ ਬਣਾ ਕੇ ਹੋਰਾਂ ਲੋਕਾਂ ਨਾਲ ਇਹ ਡੀਵਾਈਸ ਸ਼ੇਅਰ ਕਰ ਸਕਦੇ ਹੋ। ਹਰੇਕ ਉਪਭੋਗਤਾ ਦਾ ਆਪਣਾ ਖੁਦ ਦਾ ਸਪੇਸ ਹੁੰਦਾ ਹੈ, ਜਿਸਨੂੰ ਉਹ ਐਪਸ ਅਤੇ ਵਾਲਪੇਪਰ ਆਦਿ ਨਾਲ ਅਨੁਕੂਲ ਬਣਾ ਸਕਦੇ ਹਨ। ਉਪਭੋਗਤਾ ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ ਵੀ ਵਰਤ ਸਕਦੇ ਹਨ ਜਿਵੇਂ 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>
@@ -2542,7 +2703,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>
@@ -2561,7 +2722,7 @@
     <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"ਜਦੋਂ ਤੁਸੀਂ ਟੈਪ ਅਤੇ ਭੁਗਤਾਨ ਕਰਦੇ ਹੋ ਤਾਂ ਕੀ <xliff:g id="APP_1">%2$s</xliff:g> ਦੀ ਬਜਾਏ ਹਮੇਸ਼ਾ <xliff:g id="APP_0">%1$s</xliff:g> ਦਾ ਉਪਯੋਗ ਕਰਨਾ ਹੈ?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"ਪ੍ਰਤਿਬੰਧ"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"ਪ੍ਰਤਿਬੰਧ ਹਟਾਓ"</string>
-    <string name="restriction_menu_change_pin" msgid="740081584044302775">"ਪਿੰਨ ਬਦਲੋ"</string>
+    <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>
@@ -2598,9 +2759,9 @@
     <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">"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_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>
     <string name="wizard_back" msgid="5567007959434765743">"ਪਿੱਛੇ"</string>
@@ -2654,17 +2815,20 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, ਵਾਇਰਲੈੱਸ, ਡੈਟਾ, 4g,3g, 2g, lte"</string>
@@ -2687,7 +2851,7 @@
     <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_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ਨਾ ਕਰੋ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ, ਰੋਕੋ, ਰੁਕਾਵਟ, ਬ੍ਰੇਕ"</string>
     <string name="keywords_app" msgid="6334757056536837791">"ਰੈਮ"</string>
     <string name="keywords_location" msgid="6615286961552714686">"ਨੇੜਲੇ, ਟਿਕਾਣਾ, ਇਤਿਹਾਸ, ਰਿਪੋਰਟਿੰਗ"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"ਸ਼ੁੱਧਤਾ"</string>
@@ -2703,12 +2867,18 @@
     <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_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_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>
@@ -2718,7 +2888,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>
@@ -2751,16 +2921,16 @@
       <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_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_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="6207040454949823153">"ਕਾਰਜ ਅਤੇ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲਾਂ ਲਈ ਧੁਨੀਆਂ ਇੱਕੋ ਹਨ"</string>
@@ -2784,12 +2954,12 @@
     <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="notification_channel_title" msgid="2260666541030178452">"ਸੂਚਨਾ ਸ਼੍ਰੇਣੀ"</string>
@@ -2816,15 +2986,15 @@
     </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="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_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,13 +3003,11 @@
     <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="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>
@@ -2855,14 +3023,14 @@
     </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_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_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>
@@ -2886,9 +3054,9 @@
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"ਅਗਿਆਤ"</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_schedule_rule_enabled_toast" msgid="3379499360390382259">"ਨਿਰਧਾਰਿਤ ਸਮੇਂ ਦੇ ਦੌਰਾਨ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਕਰਨ ਲਈ ਸਵੈਚਲ ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</string>
     <string name="zen_event_rule_type_name" msgid="2645981990973086797">"ਵਰਤਾਰਾ ਨਿਯਮ"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"ਨਿਰਧਾਰਿਤ ਇਵੈਂਟਸ ਦੇ ਦੌਰਾਨ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕਰਨ ਲਈ ਸਵੈਚਾਲਿਤ ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</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>
@@ -2942,50 +3110,45 @@
     </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_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_on" msgid="7712038508173845101">"ਸਕ੍ਰੀਨ ਦੇ ਬੰਦ ਹੋਣ \'ਤੇ ਬਲੌਕ ਕਰੋ"</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_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="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_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>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ PIN ਮੰਗੋ"</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" 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">"ਕੀ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ?"</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>
-    <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਿੰਨ ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
+    <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ PIN ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <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_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>
@@ -2999,7 +3162,7 @@
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="STORAGE_TYPE">%2$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="SIZE">%1$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g> ਤੋਂ ਵਰਤਿਆ ਗਿਆ"</string>
     <string name="storage_used" msgid="7128074132917008743">"ਸਟੋਰੇਜ ਵਰਤੀ"</string>
     <string name="change" msgid="6657848623929839991">"ਬਦਲੋ"</string>
@@ -3011,7 +3174,7 @@
     <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>
@@ -3039,7 +3202,7 @@
     <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>
@@ -3063,13 +3226,13 @@
     <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_app" msgid="6864503001385843060">"(ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</string>
@@ -3095,6 +3258,12 @@
     <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>
+    <!-- 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>
@@ -3110,15 +3279,15 @@
     <string name="additional_permissions" msgid="6463784193877056080">"ਅਤਿਰਿਕਤ ਅਨੁਮਤੀਆਂ"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> ਹੋਰ"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"ਕੀ ਬੱਗ ਰਿਪੋਰਟ ਸਾਂਝੀ ਕਰਨੀ ਹੈ?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"ਤੁਹਾਡੇ IT ਪ੍ਰਸ਼ਾਸਕ ਨੇ ਇਸ ਡੀਵਾਈਸ ਦੀ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ ਬੱਗ ਰਿਪੋਰਟ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ। ਐਪਾਂ ਅਤੇ ਡਾਟੇ ਨੂੰ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"ਤੁਹਾਡੇ IT ਪ੍ਰਸ਼ਾਸਕ ਨੇ ਇਸ ਡੀਵਾਈਸ ਦੀ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ ਬੱਗ ਰਿਪੋਰਟ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ। ਐਪਾਂ ਅਤੇ ਡਾਟੇ ਨੂੰ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਅਤੇ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਆਰਜ਼ੀ ਤੌਰ \'ਤੇ ਹੌਲੀ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"ਤੁਹਾਡੇ IT ਪ੍ਰਸ਼ਾਸਕ ਨੇ ਇਸ ਡੀਵਾਈਸ ਦੀ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਵਿੱੱਚ ਮਦਦ ਲਈ ਬੱਗ ਰਿਪੋਰਟ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ। ਐਪਾਂ ਅਤੇ ਡੈਟੇ ਨੂੰ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"ਤੁਹਾਡੇ IT ਪ੍ਰਸ਼ਾਸਕ ਨੇ ਇਸ ਡੀਵਾਈਸ ਦੀ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ ਬੱਗ ਰਿਪੋਰਟ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ। ਐਪਾਂ ਅਤੇ ਡੈਟੇ ਨੂੰ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਅਤੇ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਆਰਜ਼ੀ ਤੌਰ \'ਤੇ ਹੌਲੀ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"ਇਸ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਤੁਹਾਡੇ IT ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਉਹਨਾਂ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"ਸਾਂਝਾ ਕਰੋ"</string>
     <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_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>
@@ -3139,7 +3308,7 @@
     <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_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>
@@ -3165,8 +3334,8 @@
     <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_revoke_warning_dialog_summary" msgid="5518216907304930148">"ਇਸ ਐਪ ਵੱਲੋਂ ਬਣਾਏ ਸਾਰੇ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨਿਯਮ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</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>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"ਤੁਹਾਡੀ ਬੈਟਰੀ ਨੂੰ ਹੋਰ ਵੀ ਛੇਤੀ ਖ਼ਤਮ ਕਰ ਸਕਦਾ ਹੈ।"</string>
@@ -3187,8 +3356,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="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>
@@ -3200,8 +3370,6 @@
     <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_switch_title" msgid="3621381992793251070">"ਇਸ ਸਰੋਤ ਤੋਂ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"ਕੈਮਰੇ ਲਈ ਦੋ ਵਾਰ ਮੋੜੋ"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"ਆਪਣੇ ਗੁੱਟ ਨੂੰ ਦੋ ਵਾਰ ਮੋੜਕੇ ਕੈਮਰਾ ਐਪ ਖੋਲ੍ਹੋ"</string>
@@ -3254,23 +3422,23 @@
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</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>
     <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">"ਪੋਰਟੇਬਲ 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_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_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_bg_data_title" msgid="2483860304802846542">"ਡਾਟਾ ਸੇਵਰ ਚਾਲੂ ਹੈ"</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>
@@ -3285,9 +3453,9 @@
     <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="ethernet_data_usage" msgid="5108764537574354616">"ਈਥਰਨੈੱਟ ਡਾਟਾ ਵਰਤੋਂ"</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>
@@ -3296,14 +3464,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>
@@ -3313,22 +3480,22 @@
     <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>
+      <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="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="unrestricted_app_title" msgid="4465437191723332066">"ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡਾਟਾ ਵਰਤੋਂ"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"ਜਦੋਂ ਡਾਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਗੈਰ-ਪ੍ਰਤੀਬੰਧਿਤ ਪਹੁੰਚ ਦੀ ਮਨਜ਼ੂਰੀ ਦਿਓ"</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="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">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ 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>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"ਚਾਲੂ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3382,7 +3549,6 @@
     <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_warning" msgid="9086859595338944882">"ਪ੍ਰੀਮੀਅਮ SMS ਦਾ ਤੁਹਾਡੇ ਤੋਂ ਖ਼ਰਚਾ ਲਿਆ ਜਾ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਬਿੱਲਾਂ ਵਿੱਚ ਵਾਧਾ ਹੋ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਲਈ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਉਸ ਐਪ ਦੀ ਵਰਤੋਂ ਨਾਲ ਪ੍ਰੀਮੀਅਮ SMS ਭੇਜਣ ਦੇ ਯੋਗ ਹੋ ਜਾਵੋਗੇ।"</string>
@@ -3441,34 +3607,61 @@
     <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="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="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>
+    <!-- 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_title" product="device" msgid="3423781975742145894">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਡੀਵਾਈਸ \'ਤੇ ਡਬਲ-ਟੈਪ ਕਰੋ"</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>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ"</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">"ਸੂਚਨਾਵਾਂ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਵਾਈਪ ਕਰੋ"</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_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>
@@ -3492,15 +3685,15 @@
     <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="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_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_installed_packages" msgid="2313698828178764590">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਦੀ ਸੂਚੀ"</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>
@@ -3532,8 +3725,8 @@
       <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>
-    <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"ਸਾਰਾ ਡੀਵਾਈਸ ਡਾਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਗਿਣਤੀ"</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>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼</item>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-pl/arrays.xml b/res/values-pl/arrays.xml
index db6284c..ad48481 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobra"</item>
     <item msgid="8986346415847956850">"Doskonała"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Zawsze"</item>
-    <item msgid="844721238536786870">"Tylko, gdy podłączony"</item>
-    <item msgid="1986753720941888596">"Nigdy"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Zawsze"</item>
-    <item msgid="7433294150916905997">"Tylko, gdy podłączony"</item>
-    <item msgid="1390404486722375028">"Nigdy"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Ostatnie 30 dni"</item>
     <item msgid="6600989128423965319">"Ustaw cykl danych..."</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 006b3ff..ef027c9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odmów"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zamknij"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Przełącz"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nieznane"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="few">Od zostania programistą dzielą Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroki.</item>
       <item quantity="many">Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroków.</item>
@@ -32,6 +31,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 +43,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 +109,26 @@
     <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>
+    <!-- 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">"Nie masz uprawnień, by zmienić ustawienia Bluetootha."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +140,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +177,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Twoje urządzenia"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data i czas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Wybierz strefę czasową"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +356,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 +383,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +493,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 +565,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmień wzór odblokowania"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmień kod PIN odblokowania"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Spróbuj ponownie. Próba <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Ostatnia próba"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Jeśli podasz teraz nieprawidłowy wzór do profilu, Twój profil do pracy i powiązane dane zostaną usunięte z tego urządzenia."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Jeśli podasz teraz nieprawidłowy kod PIN do profilu, Twój profil do pracy i powiązane dane zostaną usunięte z tego urządzenia."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Jeśli podasz teraz nieprawidłowe hasło do profilu, Twój profil do pracy i powiązane dane zostaną usunięte z tego urządzenia."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Zbyt wiele nieudanych prób. Twój profil do pracy i powiązane dane zostaną usunięte z tego urządzenia."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Zamknij"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Spróbuj ponownie. Próba <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Dane zostaną usunięte"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Jeśli następnym razem podasz nieprawidłowy wzór, dane na urządzeniu zostaną usunięte"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Jeśli następnym razem podasz nieprawidłowy kod PIN, dane na urządzeniu zostaną usunięte"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Jeśli następnym razem podasz nieprawidłowe hasło, dane na urządzeniu zostaną usunięte"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Jeśli następnym razem podasz nieprawidłowy wzór, użytkownik zostanie usunięty"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Jeśli następnym razem podasz nieprawidłowy kod PIN, użytkownik zostanie usunięty"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Jeśli następnym razem podasz nieprawidłowe hasło, użytkownik zostanie usunięty"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jeśli następnym razem podasz nieprawidłowy wzór, profil do pracy oraz powiązane z nim dane zostaną usunięte"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jeśli następnym razem podasz nieprawidłowy kod PIN, profil do pracy oraz powiązane z nim dane zostaną usunięte"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Jeśli następnym razem podasz nieprawidłowe hasło, profil do pracy oraz powiązane z nim dane zostaną usunięte"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Zbyt wiele nieudanych prób. Dane na urządzeniu zostaną usunięte."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Zbyt wiele nieudanych prób. Użytkownik zostanie usunięty."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Zbyt wiele nieudanych prób. Profil do pracy i powiązane z nim dane zostaną usunięte."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Zamknij"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Minimalna liczba znaków to <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Minimalna liczba cyfr w kodzie PIN to <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Dalej"</string>
@@ -648,6 +696,22 @@
     <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>
+    <!-- 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">"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>
@@ -769,7 +833,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ustawienie zabezpieczeń routera bezprzewodowego (TKIP) nie jest obsługiwane"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Błąd uwierzytelniania. Spróbuj ponownie."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Wykryto inną sesję WPS. Spróbuj ponownie za kilka minut."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Brak połączenia z Wi‑Fi. Konfiguracja przez WPS została anulowana."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nazwa sieci"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Wpisz identyfikator SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpieczenia"</string>
@@ -834,7 +897,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 +933,28 @@
     <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>
+    <!-- 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_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">"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 +1001,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>
@@ -1004,23 +1086,33 @@
     <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>
+    <!-- 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">"Czas rozpoczęcia"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Czas zakończenia"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Wł. / <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">"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 +1136,19 @@
     <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>
+    <!-- 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">"Włącz ekran po otrzymaniu powiadomień"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Zawsze włączony"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Pokazuj godzinę, ikony powiadomień i inne informacje"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Powiększ lub pomniejsz tekst"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
@@ -1299,11 +1402,12 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Resetowanie"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Resetuj ustawienia sieciowe"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Resetowanie ustawień sieciowych"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Spowoduje to usunięcie wszystkich ustawień sieciowych, w tym:\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilnej transmisji danych"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Zresetuj ustawienia"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Zresetować wszystkie ustawienia sieciowe? Tego działania nie można cofnąć."</string>
@@ -1330,6 +1434,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Wymaż kartę SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Usuń z wewnętrznego nośnika USB wszystkie dane, takie jak pliki muzyczne i zdjęcia"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Usuń z karty SD wszystkie dane, takie jak pliki muzyczne i zdjęcia"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Wykasuj karty eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Wykasuj wszystkie karty eSIM z telefonu. To nie spowoduje anulowania abonamentu w sieci komórkowej."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Wykasuj wszystkie karty eSIM z tabletu. To nie spowoduje anulowania abonamentu w sieci komórkowej."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetuj tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetuj telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Wymazać wszystkie Twoje informacje osobiste i pobrane aplikacje? Tego działania nie można cofnąć."</string>
@@ -1352,26 +1459,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1505,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>
@@ -1519,6 +1620,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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 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>
@@ -1580,6 +1687,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Pracują"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Nośnik USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na karcie SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Wyłączone"</string>
     <string name="not_installed" msgid="2797554494953450291">"Dla tego użytk. niezainstalowana"</string>
     <string name="installed" msgid="3070865169422600098">"Zainstalowana"</string>
     <string name="no_applications" msgid="7336588977497084921">"Brak aplikacji"</string>
@@ -1689,6 +1797,11 @@
     <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>
+    <!-- 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">"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>
@@ -1784,7 +1897,7 @@
     <string name="usage_time_label" msgid="295954901452833058">"Czas użycia"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Ułatwienia dostępu"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ustawienia ułatwień dostępu"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"Czytniki, wyświetlacz, sterowanie interakcją"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Czytniki ekranu, 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="screen_reader_category_title" msgid="7739154903913400641">"Czytniki ekranu"</string>
@@ -1915,6 +2028,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 +2100,46 @@
     <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>
+    <!-- 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">"Latarka"</string>
     <string name="power_camera" msgid="4976286950934622605">"Aparat"</string>
@@ -1995,7 +2154,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2207,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2073,9 +2235,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">"Procentowy poziom naładowania baterii"</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>
@@ -2708,17 +2868,20 @@
       <item quantity="one">Pokaż %d ukryty element</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Sieć i internet"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, sieć komórkowa, transmisja danych, hotspot"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"sieć komórkowa"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"transmisja danych"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Połączone urządzenia"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, przesyłanie, komunikacja NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, przesyłanie"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacje i powiadomienia"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Uprawnienia, aplikacje domyślne"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Użytkownicy i konta"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Domyślne aplikacje"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Języki, kopia zapasowa, aktualizacje"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ustawienia"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Wyszukaj ustawienia"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Wyszukaj ustawienia"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Ustawienia wyszukiwania"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Ustawienia wyszukiwania"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, połączenie sieciowe"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, pisanie SMS-ów, wiadomości, SMS-owanie"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"komórkowy, mobilne, operator komórkowy, bezprzewodowe, dane, 4g, 3g, 2g, lte"</string>
@@ -2763,6 +2926,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"płacenie, klikanie, płatności"</string>
     <string name="keywords_backup" msgid="470070289135403022">"kopia zapasowa, tworzenie kopii zapasowej"</string>
+    <!-- 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">"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>
@@ -2891,8 +3060,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>
@@ -3031,11 +3198,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 +3205,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>
@@ -3168,7 +3330,15 @@
     <string name="high_power_apps" msgid="3459065925679828230">"Optymalizacja baterii"</string>
     <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="hide_extra_apps" msgid="5016497281322459633">"Pokaż zużycie przez aplikacje1"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Wysokie wykorzystanie"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacje działają nieprawidłowo</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacji działa nieprawidłowo</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacji działa nieprawidłowo</item>
+      <item quantity="one">Aplikacja <xliff:g id="APP">%1$s</xliff:g> działa nieprawidłowo</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3263,8 +3433,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalowanie nieznanych aplikacji"</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>
@@ -3276,8 +3447,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Uprawnienie aplikacji do modyfikowania ust. systemu"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Zezwól na modyfikowanie ustawień systemu"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"To uprawnienie umożliwia aplikacji modyfikowanie ustawień systemu."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Tak"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Zezwól z tego źródła"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dwukrotny obrót otwiera aparat"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otwórz aplikację aparatu, obracając dwukrotnie nadgarstkiem"</string>
@@ -3374,8 +3543,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 +3567,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>
@@ -3466,7 +3634,6 @@
     <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="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>
@@ -3537,28 +3704,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatyczne"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Instrukcja"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Zwolnij miejsce teraz"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesty"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Skróty gestów"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Sterowanie telefonem za pomocą krótkich gestów"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Sterowanie tabletem za pomocą krótkich gestów"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Sterowanie urządzeniem za pomocą krótkich gestów"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Uruchamianie aparatu"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Aby szybko uruchomić aparat, naciśnij dwukrotnie przycisk zasilania. Możesz to zrobić na dowolnym ekranie."</string>
+    <!-- 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">"Obrót aparatu"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Podnieś, by otworzyć aparat"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Aby automatycznie otworzyć aparat, podnieś telefon i ustaw jak do zrobienia zdjęcia (poziomo lub pionowo). Działa, gdy telefon jest w trybie uśpienia lub zablokowany."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Robienie zdjęć przy uśpionym lub zablokowanym telefonie"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gest pomocy"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Czułość"</string>
@@ -3676,6 +3870,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 +3884,10 @@
     <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>
+    <!-- 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-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 5619fb9..b5d9790 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Boa"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Somente quando conectado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Somente quando conectado"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 dias"</item>
     <item msgid="6600989128423965319">"Definir ciclo de uso..."</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 37b2767..5ffcfa4 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fechar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
       <item quantity="other">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Você não tem permissão para alterar as configurações de Bluetooth."</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> está visível para dispositivos próximos enquanto as configurações de Bluetooth estão abertas."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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) -->
@@ -264,7 +287,7 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configurações de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="okay" msgid="1997666393121016642">"Ok"</string>
-    <string name="forget" msgid="1400428660472591263">"Esquecer"</string>
+    <string name="forget" msgid="1400428660472591263">"Ignorar"</string>
     <string name="save" msgid="879993180139353333">"Salvar"</string>
     <string name="done" msgid="6942539184162713160">"Concluído"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
@@ -285,7 +308,7 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Conectar aos serviços de dados quando estiver em roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Você perdeu a conectividade de dados porque deixou o roaming de dados da sua rede doméstica desativado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ativar"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Pode haver cobranças significativas."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Pode acarretar cobranças significativas"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ao permitir o roaming de dados, você poderá receber cobranças significativas de roaming.\n\nEsta configuração afeta todos os usuários do tablet."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ao permitir o roaming de dados, você poderá receber cobranças significativas de roaming.\n\nEsta configuração afeta todos os usuários do telefone."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Permitir roaming de dados?"</string>
@@ -313,7 +336,7 @@
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
-    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após suspensão"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após modo de espera"</string>
     <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>
@@ -329,7 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Segurança e local"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Segurança e local"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Smartphone criptografado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositivo criptografado"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"Ignorar"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localize o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressão digital na parte de trás do smartphone."</string>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"O registro não foi concluído"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Prazo de registro de impressões digitais atingido. Tente novamente."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro de impressões digitais não funcionou. Tente novamente ou use um dedo diferente."</string>
@@ -449,6 +487,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolha seu método de bloqueio de tela alternativo"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opções de bloqueio de tela"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opções de bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Imediatamente após a suspensão"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> após a suspensão"</string>
@@ -519,13 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mudar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar senha de desbloqueio"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Última tentativa"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se você informar um padrão de trabalho incorreto nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se você informar um PIN de trabalho incorreto nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se você informar uma senha de trabalho incorreta nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Excesso de tentativas incorretas. Seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dispensar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Seus dados serão excluídos"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se você informar um padrão incorreto na próxima tentativa, os dados deste dispositivo serão excluídos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se você informar um PIN incorreto na próxima tentativa, os dados deste dispositivo serão excluídos"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se você informar uma senha incorreta na próxima tentativa, os dados deste dispositivo serão excluídos."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se você informar um padrão incorreto na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se você informar um PIN incorreto na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se você informar uma senha incorreta na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se você informar um padrão incorreto na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se você informar um PIN incorreto na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se você informar uma senha incorreta na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Excesso de tentativas incorretas. Os dados deste dispositivo serão excluídos."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Excesso de tentativas incorretas. O usuário será excluído."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Excesso de tentativas incorretas. Este perfil de trabalho e os dados correspondentes serão excluídos."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dispensar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"O PIN precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +674,22 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para aumentar a precisão da localização, apps e serviços do sistema ainda detectam dispositivos Bluetooth. É possível alterar isso nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <!-- 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">"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>
@@ -700,8 +764,8 @@
     <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>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Não mostrar novamente"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi durante suspensão"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi ativo durante suspensão"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi durante inatividade"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi ativ. durante suspensão"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema com a mudança de configuração"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Melhorar a eficiência"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Otimização de Wi-Fi"</string>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A configuração de segurança do roteador sem fio (TKIP) não é suportada"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Outra sessão WPS foi detectada. Tente novamente em alguns minutos."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi-Fi desconectado. Configuração do WPS cancelada."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nome da rede"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Digite o SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,24 +1062,34 @@
     <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>
+    <!-- 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">"Horário de início"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Horário de término"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desativado / <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">"Ativado / <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">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
@@ -1010,7 +1102,7 @@
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Ao carregar ou se ancorado"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Ao carregar"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando ancorado"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando encaixado"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Nunca"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desativado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar o que acontece quando o smartphone está ancorado e/ou no modo de suspensão, ative o protetor de tela."</string>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"Ativar a tela ao receber notificações"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar horário, ícones de notificação e outras informações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
@@ -1157,7 +1260,7 @@
     <string name="storage_menu_format_public" msgid="7464714208010125682">"Formatar como portátil"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"Formatar como interno"</string>
     <string name="storage_menu_migrate" msgid="3969621494238154294">"Migrar dados"</string>
-    <string name="storage_menu_forget" msgid="6305824238997983426">"Esquecer"</string>
+    <string name="storage_menu_forget" msgid="6305824238997983426">"Ignorar"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurar"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorar"</string>
     <string name="storage_menu_free" msgid="6386070442027135427">"Liberar espaço"</string>
@@ -1189,7 +1292,7 @@
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Esse dispositivo não suporta o <xliff:g id="NAME_0">^1</xliff:g>. \n\nPara usar o <xliff:g id="NAME_1">^1</xliff:g> com esse dispositivo, é necessário configurá-lo primeiro."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Após a formatação, você pode usar este <xliff:g id="NAME_0">^1</xliff:g> em outros dispositivos. \n\nTodos os dados deste <xliff:g id="NAME_1">^1</xliff:g> serão apagados. Faça backup primeiro. \n\n"<b>"Backup de fotos e outras mídias"</b>" \nMova seus arquivos de mídia para um local de armazenamento alternativo neste dispositivo ou transfira-os para um computador usando um cabo USB. \n\n"<b>"Backup de apps"</b>" \nTodos os apps armazenados neste <xliff:g id="NAME_6">^1</xliff:g> serão desinstalados, e os dados deles serão apagados. Para manter esses apps, mova-os para um local de armazenamento alternativo neste dispositivo."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Quando você ejetar este <xliff:g id="NAME_0">^1</xliff:g>, os apps armazenados nele deixarão de funcionar, e os arquivos de mídia não ficarão disponíveis até que ele seja inserido novamente."</b>" \n\nEste <xliff:g id="NAME_1">^1</xliff:g> é formatado para funcionar apenas neste dispositivo. Não funcionará em nenhum outro."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Para usar os apps, fotos ou dados que este <xliff:g id="NAME">^1</xliff:g> contém, insira-o novamente. \n\nVocê também pode esquecer esse armazenamento se o dispositivo não estiver disponível. \n\nSe você optar por esquecê-lo, todos os dados do dispositivo serão perdidos para sempre. \n\nÉ possível reinstalar os apps mais tarde, mas os dados armazenados neste dispositivo serão perdidos."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Para usar os apps, fotos ou dados que este <xliff:g id="NAME">^1</xliff:g> contém, insira-o novamente. \n\nVocê também pode ignorar esse armazenamento se o dispositivo não estiver disponível. \n\nSe você optar por ignorá-lo, todos os dados do dispositivo serão perdidos para sempre. \n\nÉ possível reinstalar os apps mais tarde, mas os dados armazenados neste dispositivo serão perdidos."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Esquecer <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Todos os apps, fotos e dados armazenados nesse <xliff:g id="NAME">^1</xliff:g> serão perdidos permanentemente."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"Apps"</string>
@@ -1237,7 +1340,7 @@
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Editar ponto de acesso"</string>
-    <string name="apn_not_set" msgid="4974192007399968164">"Sem definição"</string>
+    <string name="apn_not_set" msgid="4974192007399968164">"Não definido"</string>
     <string name="apn_name" msgid="4115580098369824123">"Nome"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"Proxy"</string>
@@ -1273,12 +1376,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>
@@ -1292,7 +1396,7 @@
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"O armazenamento interno e todos os dados serão redefinidos"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps baixados"</li></string>
     <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>
@@ -1302,8 +1406,11 @@
     <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_button_text" product="default" msgid="7550632653343157971">"Redefinir telefone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps baixados por download? Não é possível desfazer esta ação."</string>
     <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>
@@ -1324,29 +1431,23 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de celular"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"App de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar app de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Usar o <xliff:g id="NEW_APP">%1$s</xliff:g> em vez do <xliff:g id="CURRENT_APP">%2$s</xliff:g> como app de SMS?"</string>
@@ -1376,7 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1537,9 +1644,9 @@
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar serviços em exec."</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar processo em cache"</string>
     <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" msgid="1321050641018356925">"Redefinir preferências"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir preferências?"</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 plano de fundo para apps"</li>" \n "<li>"quaisquer restrições de permissão"</li>" \n\n Você não perderá dados de 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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Rodando"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Cartão SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Desativado"</string>
     <string name="not_installed" msgid="2797554494953450291">"Não instalado para o usuário"</string>
     <string name="installed" msgid="3070865169422600098">"Instalado"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nenhum app."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1756,7 +1869,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configurações de acessibilidade"</string>
     <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_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Config.\"."</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>
@@ -1765,7 +1878,7 @@
     <string name="experimental_category_title" msgid="5272318666666893547">"Experimentais"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Leitor de tela, usado principalmente para pessoas com deficiência visual total ou parcial"</string>
-    <string name="select_to_speak_summary" msgid="4282846695497544515">"Tocar nos itens exibidos na tela para ouvir a leitura deles em voz alta"</string>
+    <string name="select_to_speak_summary" msgid="4282846695497544515">"Toque nos itens exibidos na tela para ouvir a leitura deles em voz alta"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Legendas"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Ampliação"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Ampliar com toque triplo"</string>
@@ -1873,6 +1986,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>
@@ -1912,7 +2029,7 @@
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a última carga completa (<xliff:g id="TIME">^1</xliff:g> atrás)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Tela"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Câmera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2014,7 +2174,7 @@
     <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>
-    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> do uso total de apps (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> do uso total do app (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Desde a carga completa"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"Gerenciar uso da bateria"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tempo restante estimado"</string>
@@ -2223,7 +2383,7 @@
     <string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está enfrentando problemas no momento. Ela retornará em breve."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"Perfil de trabalho ainda indisponível"</string>
-    <string name="work_mode_label" msgid="5794470908668593961">"Modo trabalho"</string>
+    <string name="work_mode_label" msgid="5794470908668593961">"Modo de trabalho"</string>
     <string name="work_mode_summary" msgid="1620246003886940776">"Permitir que o perfil de trabalho funcione, incluindo apps, sincronização em segundo plano e recursos relacionados"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"Remover perfil de trabalho"</string>
     <string name="background_data" msgid="5779592891375473817">"Dados de segundo plano"</string>
@@ -2396,7 +2556,7 @@
     <string name="vpn_connect" msgid="8469608541746132301">"Conectar"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"Substituir"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"Editar perfil de VPN"</string>
-    <string name="vpn_forget" msgid="3684651372749415446">"Esquecer"</string>
+    <string name="vpn_forget" msgid="3684651372749415446">"Ignorar"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar-se a <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Desconectar"</string>
@@ -2507,7 +2667,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Excluir <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Configurações de tela de bloqueio"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Adicionar usuários na tela de bloqueio"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Adicionar usuários a partir da tela de bloqueio"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo usuário"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Excluir a si mesmo?"</string>
@@ -2542,7 +2702,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuração afeta todos os usuários do tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toque e pague"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tocar e pagar"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Como funciona"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Pague com seu smartphone nas lojas"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"Pagamento padrão"</string>
@@ -2551,13 +2711,13 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Usar padrão"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Sempre"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Exceto quando outro app de pagamento estiver aberto"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Em um terminal \"Toque e pague\", pagar com:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Em um terminal \"Tocar e pagar\", pagar com:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Como pagar no terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Configure um app de pagamento. Em seguida, basta segurar a parte traseira do seu smartphone em direção a qualquer terminal com o símbolo indicando ausência de contato."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Entendi"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Mais..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Definir como preferência?"</string>
-    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Sempre usar o app <xliff:g id="APP">%1$s</xliff:g> com \"Toque e pague\"?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Sempre usar o app <xliff:g id="APP">%1$s</xliff:g> com \"Tocar e pagar\"?"</string>
     <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Sempre usar o <xliff:g id="APP_0">%1$s</xliff:g> em vez do <xliff:g id="APP_1">%2$s</xliff:g> ao tocar e pagar?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Apps padrão"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, horário, backup e atualizações"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Procurar nas configurações"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Procurar nas configurações"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Configurações de pesquisa"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Configurações de pesquisa"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexão de rede"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensagem de texto, enviar mensagens de texto, mensagens"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, dispositivo móvel, operadora de celular, sem fio, dados, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <!-- 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">"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>
@@ -2751,7 +2920,7 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> regra automática ativada</item>
       <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_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_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>
@@ -2833,8 +3002,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>
@@ -2861,8 +3028,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações na aba ou em dispositivos periféricos"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"Permitir ponto de notificação"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar ponto de notificação"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorar \"Não perturbe\""</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que as notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -3062,14 +3224,14 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Não reconhecido"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Padrão"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Padrão para trabalho"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistente e entrada por voz"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assist. e entrada por voz"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"App de assistência"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Tornar o app <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> seu assistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"O assistente lerá informações sobre apps em uso no seu sistema, incluindo informações visíveis na tela ou as que podem ser acessadas nos apps."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceito"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Discordo"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Escolher entrada por voz"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"App de navegação"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"App de navegador"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Nenhum navegador padrão"</string>
     <string name="default_phone_title" msgid="282005908059637350">"App de telefone"</string>
     <string name="default_app" msgid="6864503001385843060">"Padrão"</string>
@@ -3095,13 +3257,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> app está com comportamento anormal</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps estão com comportamento anormal</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
+    <string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
     <string name="high_power_system" msgid="7362862974428225301">"A otimização de bateria não está disponível"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Não aplicar a otimização de bateria. Isso pode esgotar sua bateria mais rapidamente."</string>
-    <string name="high_power_prompt_title" msgid="6358673688590282655">"Permitir que o app sempre esteja em execução em segundo plano?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"A execução contínua do app <xliff:g id="APP_NAME">%1$s</xliff:g> em segundo plano pode reduzir a duração da bateria. \n\nVocê poderá alterar essa opção mais tarde em \"Configurar\" &gt; \"Apps e notificações\"."</string>
+    <string name="high_power_prompt_title" msgid="6358673688590282655">"Deseja permitir que o app sempre esteja em execução em segundo plano?"</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Permitir que <xliff:g id="APP_NAME">%1$s</xliff:g> sempre esteja em execução em segundo plano pode reduzir a duração da bateria. \n\nVocê poderá alterar essa opção mais tarde nas notificações de Configurações &gt; Apps."</string>
     <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> de uso desde a última carga completa"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Gerenciamento de energia"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Sem uso da bateria desde a última carga completa"</string>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalar apps desconhecidos"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Permissão p/ app modificar configurações do sistema"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificação de config. do sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Permitir desta fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Girar duas vezes para abrir a câmera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
@@ -3274,7 +3441,7 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Os dados em segundo plano estão disponíveis apenas via Wi-Fi. Isso poderá afetar alguns apps ou serviços quando o Wi-Fi não estiver disponível."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabalho desativado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Os apps, a sincronização em segundo plano e outros recursos relacionados com seu perfil de trabalho estão desativados."</string>
-    <string name="condition_night_display_title" msgid="5599814941976856183">"O modo noturno está ativado"</string>
+    <string name="condition_night_display_title" msgid="5599814941976856183">"A Iluminação noturna está ativada"</string>
     <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>
@@ -3296,8 +3463,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 +3483,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>
@@ -3378,11 +3544,10 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter…"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"O limite de taxa do ShortcutManager foi redefinido"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Notificações da tela de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificações da tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas as opções"</string>
     <string name="page_tab_title_support" msgid="6330657582897417458">"Suporte"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="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>
@@ -3407,7 +3572,7 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"Tarifas internacionais podem ser aplicadas"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefone"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Bate-papo"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Conferir dicas e truques"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar dicas e truques"</string>
     <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar feedback"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Entre em contato com o suporte"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Fazer login"</string>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espaço agora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Atalhos de gestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar seu smartphone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar seu tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar seu dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ir para a câmera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir a câmera rapidamente, pressione o botão liga/desliga duas vezes. O recurso funciona em qualquer tela."</string>
+    <!-- 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">"Virar câmera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></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>
+    <!-- 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">"Toque duas vezes na tela para verificar o smartphone"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Toque duas vezes na tela para verificar o tablet"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Toque duas vezes na tela para verificar o dispositivo"</string>
+    <!-- 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">"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="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>
+    <!-- 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">"Deslizar impressão digital para ver as notificações"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do smartphone."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do dispositivo."</string>
+    <!-- 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">"Levantar para abrir a câmera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir a câmera automaticamente, levante o smartphone até uma posição de tirar fotos (paisagem ou retrato). Funciona quando o smartphone está em suspensão ou bloqueado."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tire fotos quando o telefone estiver em repouso ou bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto do Assistente"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Confidencialidade"</string>
@@ -3572,6 +3764,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>
@@ -3585,5 +3778,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"App instantâneo"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Desativar o gerenciador de armazenamento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filme e televisão"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espaço utilizado"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
+    <!-- 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-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index c69a2e1..d79abab 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Boa"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Apenas quando estiver ligado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Apenas quando estiver ligado"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 dias"</item>
     <item msgid="6600989128423965319">"Def. ciclo utilização..."</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4c9204b..8c4c993 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fechar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
-      <item quantity="one">Está agora a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passo de se tornar um programador.</item>
+      <item quantity="one">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="other">Está agora a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos de se tornar um programador.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Não tem autorização para alterar as definições de Bluetooth."</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> é visível para dispositivos próximos enquanto as definições de Bluetooth estiverem abertas."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os seus dispositivos"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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) -->
@@ -242,7 +265,7 @@
     <string name="locale_remove_menu" msgid="7651301406723638854">"Remover"</string>
     <string name="add_a_language" msgid="2330538812283783022">"Adicionar um idioma"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
-      <item quantity="one">Pretende remover o idioma selecionado?</item>
+      <item quantity="one">Remove selected languages?</item>
       <item quantity="other">Pretende remover os idiomas selecionados?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="1361354927342876114">"O texto será apresentado noutro idioma."</string>
@@ -329,7 +352,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>
@@ -347,47 +370,62 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Adicionar impressão digital"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueio de ecrã"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impressão digital configurada</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</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">"Desbloquear com impr. digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Utilizar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas ao telemóvel podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Basta tocar no sensor de impressões digitais para autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: não é possível utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o administrador da sua entidade."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas ao telemóvel podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</string>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar palavra-passe de desbloqueio"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Última tentativa"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se introduzir um padrão de trabalho incorreto nesta tentativa, o perfil de trabalho e os dados associados são removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se introduzir um PIN de trabalho incorreto nesta tentativa, o perfil de trabalho e os dados associados são removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se introduzir uma palavra-passe de trabalho incorreta nesta tentativa, o perfil de trabalho e os dados associados são removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Demasiadas tentativas incorretas. O perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignorar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Os seus dados serão eliminados"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se introduzir um padrão incorreto na tentativa seguinte, os dados deste dispositivo serão eliminados."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se introduzir um PIN incorreto na tentativa seguinte, os dados deste dispositivo serão eliminados."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se introduzir uma palavra-passe incorreta na tentativa seguinte, os dados deste dispositivo serão eliminados."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se introduzir um padrão incorreto na tentativa seguinte, este utilizador será eliminado."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se introduzir um PIN incorreto na tentativa seguinte, este utilizador será eliminado."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se introduzir uma palavra-passe incorreta na tentativa seguinte, este utilizador será eliminado."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se introduzir um padrão incorreto na tentativa seguinte, o seu perfil de trabalho e os respetivos dados serão eliminados."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se introduzir um PIN incorreto na tentativa seguinte, o seu perfil de trabalho e os respetivos dados serão eliminados."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se introduzir uma palavra-passe incorreta na tentativa seguinte, o seu perfil de trabalho e os respetivos dados serão eliminados."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Demasiadas tentativas incorretas. Os dados deste dispositivo serão eliminados."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Demasiadas tentativas incorretas. Este utilizador será eliminado."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Demasiadas tentativas incorretas. Este perfil de trabalho e os respetivos dados serão eliminados."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Tem de ter, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"O PIN tem de ter, pelo menos, <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -538,27 +586,27 @@
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Tem de incluir, pelo menos, um dígito"</string>
     <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"Tem de incluir, pelo menos, um símbolo"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
-      <item quantity="one">Tem de incluir, pelo menos, 1 letra</item>
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
-      <item quantity="one">Tem de incluir, pelo menos, 1 letra minúscula</item>
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras minúsculas</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
-      <item quantity="one">Tem de incluir, pelo menos, 1 letra maiúscula</item>
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras maiúsculas</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
-      <item quantity="one">Tem de incluir, pelo menos, 1 dígito numérico</item>
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> dígitos numéricos</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
-      <item quantity="one">Tem de incluir, pelo menos, 1 símbolo especial</item>
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> símbolos especiais</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
-      <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja uma letra</item>
+      <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
       <item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres que não sejam letras</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="942665351220525547">"O admin. do disp. não permite a utilização de uma palavra-passe recente"</string>
@@ -571,14 +619,14 @@
     <string name="manage_device_admin" msgid="537804979483211453">"Aplicações de administrador do dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Sem aplicações ativas"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação ativa</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações ativas</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agentes fidedignos"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Para utilizar, defina primeiro um bloqueio de ecrã"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Nenhum"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
-      <item quantity="one">1 agente fidedigno ativo</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agentes fidedignos ativos</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
@@ -626,6 +674,22 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Avançado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Quando o Bluetooth está ativado, o disp. pode comunicar com outros disp. Bluetooth próximos."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para melhorar a precisão da localização, os serviços e as aplicações do sistema podem continuar a detetar dispositivos Bluetooth. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de procura<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A definição de segurança do router sem fios (TKIP) não é suportada"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Foi detetada outra sessão do WPS. Tente novamente dentro de alguns minutos."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi desligado. A configuração do WPS foi cancelada."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nome da rede"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Introduza o SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
@@ -806,11 +869,10 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Redes guardadas"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
-      <item quantity="one">1 rede</item>
+      <item quantity="one">%d networks</item>
       <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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,30 +1062,40 @@
     <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>
+    <!-- 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">"Hora de início"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de fim"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Ativada/<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">"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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Predefinida"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Personalizada"</string>
-    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Alterar imagem de fundo"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Alterar a imagem de fundo"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalizar o ecrã"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Escolher imagem de fundo de"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Proteção de ecrã"</string>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"Ativar o ecrã quando recebe notificações"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar as horas, os ícones das notificações e outras informações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumentar ou diminuir o texto"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
@@ -1057,7 +1160,7 @@
     <string name="sim_preferred_message" msgid="8466930554330635780">"O <xliff:g id="NEW_SIM">%1$s</xliff:g> é o único cartão SIM no dispositivo. Pretende utilizar este cartão SIM para os dados móveis, as chamadas e as mensagens SMS?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do cartão SIM incorreto. Tem de contactar o seu operador para desbloquear o dispositivo."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
-      <item quantity="one">Código PIN incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de ter de contactar operador p/ desbloquear dispos.</item>
+      <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="other">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"Falha ao introduzir o PIN do cartão SIM!"</string>
@@ -1273,6 +1376,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>
@@ -1287,7 +1391,7 @@
     <string name="reset_network_complete_toast" msgid="787829973559541880">"As definições de rede foram repostas"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Repos. dados/fábrica"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one">1 conta será reposta</item>
+      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
       <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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Apagar todos os dados da memória de armazenamento USB interna, como músicas ou fotografias"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Apagar todos os dados do cartão SD, como músicas ou fotografias"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Apagar eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Apaga todos os eSIMs no telemóvel. Esta ação não cancela o seu plano de serviços móveis."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Apaga todos os eSIMs no tablet. Esta ação não cancela o seu plano de serviços móveis."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Repor o tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Repor telefone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Pretende apagar todas as informações pessoais e as aplicações transferidas? Não é possível anular esta ação!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1505,7 +1612,7 @@
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Limpar cache"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
-      <item quantity="one">1 item</item>
+      <item quantity="one">%d items</item>
       <item quantity="other">%d itens</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="8575655132961012158">"Limpar acesso"</string>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Em execução"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"No cartão SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Desativada"</string>
     <string name="not_installed" msgid="2797554494953450291">"Não instalado para utilizador"</string>
     <string name="installed" msgid="3070865169422600098">"Instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"Sem aplicações."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1754,7 +1867,7 @@
     <string name="usage_time_label" msgid="295954901452833058">"Tempo de utilização"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Acessibilidade"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Definições de acessibilidade"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"Leitores de ecrã, controlos de interação, ecrã"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Leitores de ecrã, visualização, controlos de interação"</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="screen_reader_category_title" msgid="7739154903913400641">"Leitores de ecrã"</string>
@@ -1799,23 +1912,23 @@
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar nas Definições rápidas"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modo de correção"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
-      <item quantity="one">Atraso extremamente curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Extremely short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso extremamente curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_very_short_delay" formatted="false" msgid="5589565607652364932">
-      <item quantity="one">Atraso muito curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Very short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso muito curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5887754135102768400">
-      <item quantity="one">Atraso curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="6340683412750219405">
-      <item quantity="one">Atraso longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_very_long_delay" formatted="false" msgid="3503199424330634970">
-      <item quantity="one">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
+      <item quantity="one">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="other">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
@@ -1870,9 +1983,13 @@
     <string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Desativado"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
-      <item quantity="one">1 serviço de impressão ativado</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tarefas de impressão</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Nenhuma impressora encontrada"</string>
@@ -1899,7 +2016,7 @@
     <string name="printer_info_desc" msgid="5824995108703060003">"Mais informações acerca desta impressora"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que tem estado a utilizar a bateria"</string>
-    <string name="power_usage_not_available" msgid="3109326074656512387">"Sem dados de uso da bateria."</string>
+    <string name="power_usage_not_available" msgid="3109326074656512387">"Dados utiliz. bater. não disp."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> restante(s)"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> a cobrar"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Ecrã"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Câmara"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2459,20 +2619,20 @@
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"A rede pode ser monitorizada"</string>
     <string name="done_button" msgid="1991471253042622230">"Concluído"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
-      <item quantity="one">Confiar ou remover o certificado</item>
+      <item quantity="one">Trust or remove certificates</item>
       <item quantity="other">Confiar ou remover os certificados</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o administrador.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Sites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o administrador.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Sites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A sua atividade de rede, incluindo emails, aplicações e Sites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
-      <item quantity="one">Verificar certificado</item>
+      <item quantity="one">Check certificates</item>
       <item quantity="other">Verificar certificados</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizadores"</string>
@@ -2650,13 +2810,16 @@
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"A seleção é necessária"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Definições"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
-      <item quantity="one">Mostrar %d item oculto</item>
+      <item quantity="one">Show %d hidden items</item>
       <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>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"cópia de segurança, fazer uma cópia de segurança"</string>
+    <!-- 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">"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>
@@ -2748,7 +2917,7 @@
     <string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Nenhuma regra automática ativada"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="one">1 regra automática ativada</item>
+      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> automatic rules turned on</item>
       <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 incomodar"</string>
@@ -2811,8 +2980,8 @@
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"As aplicações não podem ler notificações"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
-      <item quantity="one">%d aplicação pode ler notificações</item>
-      <item quantity="other">%d aplicações podem ler notificações</item>
+      <item quantity="one">%d apps can read notifications</item>
+      <item quantity="other">%d aplicações conseguem ler notificações</item>
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Nenhuma aplicação instalada solicitou acesso a notificações"</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Pretende permitir o acesso a notificações de <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -2833,8 +3002,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>
@@ -2846,11 +3013,11 @@
     <string name="app_settings_link" msgid="8894946007543660906">"Definições adicionais na aplicação"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Ativadas para todas as aplicações"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
-      <item quantity="one">Desativado para <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
+      <item quantity="one">Turned off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Desativado para <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="8028574302599397935">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminada</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias eliminadas</item>
     </plurals>
     <string name="notification_toggle_on" msgid="650145396718191048">"Ativadas"</string>
@@ -2933,12 +3100,12 @@
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"Alterar para alarmes apenas, indefinidamente"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
-      <item quantity="one">Alterar para alarmes apenas durante um minuto até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
-      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos, até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
-      <item quantity="one">Alterar para alarmes apenas durante uma hora até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
-      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> horas até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
+      <item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> horas até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para alarmes apenas, até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para interromper sempre"</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -3016,15 +3178,15 @@
     <string name="notification_summary_level" msgid="2726571692704140826">"Nível %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_0">%d</xliff:g> autorização concedida</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizações concedidas</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> autorização concedida</item>
+      <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> autorizações concedidas</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permissão adicional</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissões adicionais</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nenhuma permissão concedida"</string>
@@ -3053,7 +3215,7 @@
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Abrir <xliff:g id="DOMAIN">%s</xliff:g> e outros URLs"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Nenhum aplicação abre links compatíveis"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
-      <item quantity="one">Uma aplicação que abre links compatíveis</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações que abrem links compatíveis</item>
     </plurals>
     <string name="app_link_open_always" msgid="2474058700623948148">"Abrir com esta aplicação"</string>
@@ -3062,7 +3224,7 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Não reconhecido"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Predefinição"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Predefinição para o trabalho"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistência e entrada de voz"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Entr. texto por voz e assist."</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplicação de assistência"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Pretende tornar <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> o seu assistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"O assistente pode ler informações sobre aplicações utilizadas no seu sistema, incluindo informações visíveis no ecrã ou acessíveis nas aplicações."</string>
@@ -3071,7 +3233,7 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"Esc. entrada de texto por voz"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Aplicação do navegador"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Nenhum navegador predefinido"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Aplicação de telefone"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Aplicação Telefone"</string>
     <string name="default_app" msgid="6864503001385843060">"(Predefinição)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predefinição do sistema)"</string>
@@ -3093,8 +3255,14 @@
     <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 da bateria"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de utilização"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar utilização total do dispositivo"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"Mostrar utilização completa do dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar utilização de aplic."</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Utilização elevada"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicações estão a apresentar um comportamento anormal</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3156,7 +3324,7 @@
     <string name="free_memory" msgid="4003936141603549746">"Disponível"</string>
     <string name="memory_usage_apps" msgid="5650192998273294098">"Memória utilizada pelas aplicações"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
-      <item quantity="one">1 aplicação utilizou a memória nos(as) últimos(as) <xliff:g id="DURATION_0">%2$s</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações utilizaram a memória nos(as) últimos(as) <xliff:g id="DURATION_1">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="6622624669948277693">"Frequência"</string>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalar aplicações desconhecidas"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Autorização da aplicação para mod. def. do sistema"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificar as definições do sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Esta autorização permite que uma aplicação modifique as definições do sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Permitir desta fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Torção dupla para a câmara"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir a aplicação de câmara ao torcer o dispositivo no seu pulso"</string>
@@ -3227,7 +3394,7 @@
     <string name="disconnected" msgid="4836600637485526329">"Sem ligação"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> dos dados utilizados"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
-      <item quantity="one">Desativadas para 1 aplicação</item>
+      <item quantity="one">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
       <item quantity="other">Desativadas para <xliff:g id="COUNT">%d</xliff:g> aplicações</item>
     </plurals>
     <string name="notification_summary_none" msgid="4586376436702610">"Ativadas para todas as aplicações"</string>
@@ -3236,7 +3403,7 @@
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> utilizado – <xliff:g id="FREE_SPACE">%2$s</xliff:g> livre(s)"</string>
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Memória de armazenamento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> utilizado – <xliff:g id="FREE_SPACE">%2$s</xliff:g> livre(s)"</string>
     <string name="display_summary" msgid="6737806235882127328">"Suspender após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
-    <string name="display_dashboard_summary" msgid="4145888780290131488">"Imagem de fundo, suspensão, tamanho da letra"</string>
+    <string name="display_dashboard_summary" msgid="4145888780290131488">"Imagem de fundo, suspensão, tamanho do tipo de letra"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"Suspender após 10 minutos de inatividade"</string>
     <string name="memory_summary" msgid="8080825904671961872">"Média de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de memória utilizado(s)"</string>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Utilizador atual: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3296,11 +3463,10 @@
     <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>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"A contagem de dados do operador pode ser diferente da contagem do dispositivo"</string>
@@ -3313,11 +3479,11 @@
     <string name="configure" msgid="1029654422228677273">"Configurar"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Outras aplicações incluídas na utilização"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
-      <item quantity="one">1 aplicação autorizada a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <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>
@@ -3371,7 +3537,7 @@
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém esta chave."</string>
     <string name="special_access" msgid="3458780842491881155">"Acesso especial a aplicações"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="one">1 aplicação pode utilizar dados sem restrições</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações podem utilizar dados sem restrições</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Pretende mesmo limpar os dados do utilizador e converter para a encriptação de ficheiros?"</string>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3421,15 +3586,15 @@
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contactos"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir pesquisa de contactos por parte da sua entidade para identificar autores das chamadas e contactos"</string>
     <plurals name="hours" formatted="false" msgid="7020844602875333472">
-      <item quantity="one">1 hora</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="4666832442068789413">
-      <item quantity="one">1 minuto</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="3876307354560025025">
-      <item quantity="one">1 segundo</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo de espera de ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libertar espaço agora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Atalhos de gestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar o telemóvel"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar o tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar o dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Aceder à câmara"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir rapidamente a câmara, prima duas vezes o botão ligar/desligar. Funciona a partir de qualquer ecrã."</string>
+    <!-- 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">"Virar a câmara"</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">"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>
+    <!-- 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">"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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Utilizar impressão digital para ver as notificações"</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">"Deslizar rapidamente a impressão digital para ver as notificações"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do telemóvel."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do dispositivo."</string>
+    <!-- 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">"Levantar para abrir a câmara"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir a câmara automaticamente, levante o telemóvel e coloque-o numa posição adequada para tirar fotos (orientação de paisagem ou de retrato). Funciona quando o telemóvel está em suspensão ou bloqueado."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tire fotos quando o telemóvel está em suspensão ou bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de assistência"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidade"</string>
@@ -3509,7 +3701,7 @@
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Aplicações instaladas"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"O número de aplicações é uma estimativa. Pode não incluir as aplicações instaladas fora da Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
-      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
+      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"Autorizações de acesso à localização"</string>
@@ -3517,7 +3709,7 @@
     <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Autorizações da câmara"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Aplicações predefinidas"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Teclado predefinido"</string>
@@ -3528,7 +3720,7 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global definido"</string>
     <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais fidedignas"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
-      <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado da AC</item>
+      <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> certificados da AC</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"O administrador pode bloquear o dispositivo e repor a palavra-passe"</string>
@@ -3536,7 +3728,7 @@
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do dispositivo"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do perfil de trabalho"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativa</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativas</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="8653670456990823307">"Este dispositivo é gerido pela sua entidade."</string>
@@ -3544,18 +3736,18 @@
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saiba mais"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
-      <item quantity="one">Aplicação de câmara</item>
+      <item quantity="one">Camera apps</item>
       <item quantity="other">Aplicações de câmara</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="3545972964391065220">"Aplicação de calendário"</string>
     <string name="default_contacts_app_title" msgid="3497370557378660098">"Aplicação de contactos"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
-      <item quantity="one">Aplicação de cliente de email</item>
+      <item quantity="one">Email client apps</item>
       <item quantity="other">Aplicações de cliente de email</item>
     </plurals>
     <string name="default_map_app_title" msgid="7560143381633608567">"Aplicação de mapas"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
-      <item quantity="one">Aplicação de telefone</item>
+      <item quantity="one">Phone apps</item>
       <item quantity="other">Aplicações de telefone</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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-pt/arrays.xml b/res/values-pt/arrays.xml
index 5619fb9..b5d9790 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Boa"</item>
     <item msgid="8986346415847956850">"Excelente"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Somente quando conectado"</item>
-    <item msgid="1986753720941888596">"Nunca"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Somente quando conectado"</item>
-    <item msgid="1390404486722375028">"Nunca"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Últimos 30 dias"</item>
     <item msgid="6600989128423965319">"Definir ciclo de uso..."</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 37b2767..5ffcfa4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fechar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
       <item quantity="other">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Você não tem permissão para alterar as configurações de Bluetooth."</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> está visível para dispositivos próximos enquanto as configurações de Bluetooth estão abertas."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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) -->
@@ -264,7 +287,7 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configurações de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="okay" msgid="1997666393121016642">"Ok"</string>
-    <string name="forget" msgid="1400428660472591263">"Esquecer"</string>
+    <string name="forget" msgid="1400428660472591263">"Ignorar"</string>
     <string name="save" msgid="879993180139353333">"Salvar"</string>
     <string name="done" msgid="6942539184162713160">"Concluído"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
@@ -285,7 +308,7 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Conectar aos serviços de dados quando estiver em roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Você perdeu a conectividade de dados porque deixou o roaming de dados da sua rede doméstica desativado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ativar"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Pode haver cobranças significativas."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Pode acarretar cobranças significativas"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ao permitir o roaming de dados, você poderá receber cobranças significativas de roaming.\n\nEsta configuração afeta todos os usuários do tablet."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ao permitir o roaming de dados, você poderá receber cobranças significativas de roaming.\n\nEsta configuração afeta todos os usuários do telefone."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Permitir roaming de dados?"</string>
@@ -313,7 +336,7 @@
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
-    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após suspensão"</string>
+    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após modo de espera"</string>
     <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>
@@ -329,7 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Segurança e local"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Segurança e local"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Smartphone criptografado"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispositivo criptografado"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"Ignorar"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Voltar"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Localize o sensor"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Localize o sensor de impressão digital na parte de trás do smartphone."</string>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"O registro não foi concluído"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Prazo de registro de impressões digitais atingido. Tente novamente."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro de impressões digitais não funcionou. Tente novamente ou use um dedo diferente."</string>
@@ -449,6 +487,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você deseja usar."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolha seu método de bloqueio de tela alternativo"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opções de bloqueio de tela"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opções de bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / Imediatamente após a suspensão"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> após a suspensão"</string>
@@ -519,13 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Mudar padrão de desbloqueio"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mudar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mudar senha de desbloqueio"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Última tentativa"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Se você informar um padrão de trabalho incorreto nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Se você informar um PIN de trabalho incorreto nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Se você informar uma senha de trabalho incorreta nesta tentativa, seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Excesso de tentativas incorretas. Seu perfil de trabalho e os dados associados serão removidos deste dispositivo."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Dispensar"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Tente novamente. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> de <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Seus dados serão excluídos"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Se você informar um padrão incorreto na próxima tentativa, os dados deste dispositivo serão excluídos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Se você informar um PIN incorreto na próxima tentativa, os dados deste dispositivo serão excluídos"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Se você informar uma senha incorreta na próxima tentativa, os dados deste dispositivo serão excluídos."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Se você informar um padrão incorreto na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Se você informar um PIN incorreto na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Se você informar uma senha incorreta na próxima tentativa, este usuário será excluído"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Se você informar um padrão incorreto na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Se você informar um PIN incorreto na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Se você informar uma senha incorreta na próxima tentativa, seu perfil de trabalho e os dados correspondentes serão excluídos"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Excesso de tentativas incorretas. Os dados deste dispositivo serão excluídos."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Excesso de tentativas incorretas. O usuário será excluído."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Excesso de tentativas incorretas. Este perfil de trabalho e os dados correspondentes serão excluídos."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Dispensar"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> caracteres"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"O PIN precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> dígitos"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
@@ -626,6 +674,22 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar"</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para aumentar a precisão da localização, apps e serviços do sistema ainda detectam dispositivos Bluetooth. É possível alterar isso nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configurações de verificação<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <!-- 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">"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>
@@ -700,8 +764,8 @@
     <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>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Não mostrar novamente"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi durante suspensão"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi ativo durante suspensão"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi durante inatividade"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi ativ. durante suspensão"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema com a mudança de configuração"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Melhorar a eficiência"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Otimização de Wi-Fi"</string>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A configuração de segurança do roteador sem fio (TKIP) não é suportada"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Outra sessão WPS foi detectada. Tente novamente em alguns minutos."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi-Fi desconectado. Configuração do WPS cancelada."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nome da rede"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Digite o SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,24 +1062,34 @@
     <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>
+    <!-- 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">"Horário de início"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Horário de término"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Desativado / <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">"Ativado / <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">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
@@ -1010,7 +1102,7 @@
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Ao carregar ou se ancorado"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Ao carregar"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando ancorado"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando encaixado"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Nunca"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desativado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar o que acontece quando o smartphone está ancorado e/ou no modo de suspensão, ative o protetor de tela."</string>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"Ativar a tela ao receber notificações"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre ativado"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Mostrar horário, ícones de notificação e outras informações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
@@ -1157,7 +1260,7 @@
     <string name="storage_menu_format_public" msgid="7464714208010125682">"Formatar como portátil"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"Formatar como interno"</string>
     <string name="storage_menu_migrate" msgid="3969621494238154294">"Migrar dados"</string>
-    <string name="storage_menu_forget" msgid="6305824238997983426">"Esquecer"</string>
+    <string name="storage_menu_forget" msgid="6305824238997983426">"Ignorar"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Configurar"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Explorar"</string>
     <string name="storage_menu_free" msgid="6386070442027135427">"Liberar espaço"</string>
@@ -1189,7 +1292,7 @@
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Esse dispositivo não suporta o <xliff:g id="NAME_0">^1</xliff:g>. \n\nPara usar o <xliff:g id="NAME_1">^1</xliff:g> com esse dispositivo, é necessário configurá-lo primeiro."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Após a formatação, você pode usar este <xliff:g id="NAME_0">^1</xliff:g> em outros dispositivos. \n\nTodos os dados deste <xliff:g id="NAME_1">^1</xliff:g> serão apagados. Faça backup primeiro. \n\n"<b>"Backup de fotos e outras mídias"</b>" \nMova seus arquivos de mídia para um local de armazenamento alternativo neste dispositivo ou transfira-os para um computador usando um cabo USB. \n\n"<b>"Backup de apps"</b>" \nTodos os apps armazenados neste <xliff:g id="NAME_6">^1</xliff:g> serão desinstalados, e os dados deles serão apagados. Para manter esses apps, mova-os para um local de armazenamento alternativo neste dispositivo."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Quando você ejetar este <xliff:g id="NAME_0">^1</xliff:g>, os apps armazenados nele deixarão de funcionar, e os arquivos de mídia não ficarão disponíveis até que ele seja inserido novamente."</b>" \n\nEste <xliff:g id="NAME_1">^1</xliff:g> é formatado para funcionar apenas neste dispositivo. Não funcionará em nenhum outro."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Para usar os apps, fotos ou dados que este <xliff:g id="NAME">^1</xliff:g> contém, insira-o novamente. \n\nVocê também pode esquecer esse armazenamento se o dispositivo não estiver disponível. \n\nSe você optar por esquecê-lo, todos os dados do dispositivo serão perdidos para sempre. \n\nÉ possível reinstalar os apps mais tarde, mas os dados armazenados neste dispositivo serão perdidos."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Para usar os apps, fotos ou dados que este <xliff:g id="NAME">^1</xliff:g> contém, insira-o novamente. \n\nVocê também pode ignorar esse armazenamento se o dispositivo não estiver disponível. \n\nSe você optar por ignorá-lo, todos os dados do dispositivo serão perdidos para sempre. \n\nÉ possível reinstalar os apps mais tarde, mas os dados armazenados neste dispositivo serão perdidos."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Esquecer <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Todos os apps, fotos e dados armazenados nesse <xliff:g id="NAME">^1</xliff:g> serão perdidos permanentemente."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"Apps"</string>
@@ -1237,7 +1340,7 @@
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Editar ponto de acesso"</string>
-    <string name="apn_not_set" msgid="4974192007399968164">"Sem definição"</string>
+    <string name="apn_not_set" msgid="4974192007399968164">"Não definido"</string>
     <string name="apn_name" msgid="4115580098369824123">"Nome"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"Proxy"</string>
@@ -1273,12 +1376,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>
@@ -1292,7 +1396,7 @@
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"O armazenamento interno e todos os dados serão redefinidos"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps baixados"</li></string>
     <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>
@@ -1302,8 +1406,11 @@
     <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_button_text" product="default" msgid="7550632653343157971">"Redefinir telefone"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps baixados por download? Não é possível desfazer esta ação."</string>
     <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>
@@ -1324,29 +1431,23 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plano de celular"</string>
     <string name="sms_application_title" msgid="4903928270533250448">"App de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar app de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Usar o <xliff:g id="NEW_APP">%1$s</xliff:g> em vez do <xliff:g id="CURRENT_APP">%2$s</xliff:g> como app de SMS?"</string>
@@ -1376,7 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1537,9 +1644,9 @@
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar serviços em exec."</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar processo em cache"</string>
     <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" msgid="1321050641018356925">"Redefinir preferências"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir preferências?"</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 plano de fundo para apps"</li>" \n "<li>"quaisquer restrições de permissão"</li>" \n\n Você não perderá dados de 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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Rodando"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Cartão SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Desativado"</string>
     <string name="not_installed" msgid="2797554494953450291">"Não instalado para o usuário"</string>
     <string name="installed" msgid="3070865169422600098">"Instalado"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nenhum app."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1756,7 +1869,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configurações de acessibilidade"</string>
     <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_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Config.\"."</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>
@@ -1765,7 +1878,7 @@
     <string name="experimental_category_title" msgid="5272318666666893547">"Experimentais"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Leitor de tela, usado principalmente para pessoas com deficiência visual total ou parcial"</string>
-    <string name="select_to_speak_summary" msgid="4282846695497544515">"Tocar nos itens exibidos na tela para ouvir a leitura deles em voz alta"</string>
+    <string name="select_to_speak_summary" msgid="4282846695497544515">"Toque nos itens exibidos na tela para ouvir a leitura deles em voz alta"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Legendas"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Ampliação"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Ampliar com toque triplo"</string>
@@ -1873,6 +1986,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>
@@ -1912,7 +2029,7 @@
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a última carga completa (<xliff:g id="TIME">^1</xliff:g> atrás)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Tela"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanterna"</string>
     <string name="power_camera" msgid="4976286950934622605">"Câmera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2014,7 +2174,7 @@
     <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>
-    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> do uso total de apps (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> do uso total do app (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Desde a carga completa"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"Gerenciar uso da bateria"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tempo restante estimado"</string>
@@ -2223,7 +2383,7 @@
     <string name="sync_is_failing" msgid="1591561768344128377">"A sincronização está enfrentando problemas no momento. Ela retornará em breve."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Adicionar conta"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"Perfil de trabalho ainda indisponível"</string>
-    <string name="work_mode_label" msgid="5794470908668593961">"Modo trabalho"</string>
+    <string name="work_mode_label" msgid="5794470908668593961">"Modo de trabalho"</string>
     <string name="work_mode_summary" msgid="1620246003886940776">"Permitir que o perfil de trabalho funcione, incluindo apps, sincronização em segundo plano e recursos relacionados"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"Remover perfil de trabalho"</string>
     <string name="background_data" msgid="5779592891375473817">"Dados de segundo plano"</string>
@@ -2396,7 +2556,7 @@
     <string name="vpn_connect" msgid="8469608541746132301">"Conectar"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"Substituir"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"Editar perfil de VPN"</string>
-    <string name="vpn_forget" msgid="3684651372749415446">"Esquecer"</string>
+    <string name="vpn_forget" msgid="3684651372749415446">"Ignorar"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectar-se a <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Desconectar esta VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Desconectar"</string>
@@ -2507,7 +2667,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Excluir <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Configurações de tela de bloqueio"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Adicionar usuários na tela de bloqueio"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Adicionar usuários a partir da tela de bloqueio"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo usuário"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Excluir a si mesmo?"</string>
@@ -2542,7 +2702,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuração afeta todos os usuários do tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toque e pague"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tocar e pagar"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Como funciona"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Pague com seu smartphone nas lojas"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"Pagamento padrão"</string>
@@ -2551,13 +2711,13 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Usar padrão"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Sempre"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Exceto quando outro app de pagamento estiver aberto"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Em um terminal \"Toque e pague\", pagar com:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Em um terminal \"Tocar e pagar\", pagar com:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Como pagar no terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Configure um app de pagamento. Em seguida, basta segurar a parte traseira do seu smartphone em direção a qualquer terminal com o símbolo indicando ausência de contato."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Entendi"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Mais..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Definir como preferência?"</string>
-    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Sempre usar o app <xliff:g id="APP">%1$s</xliff:g> com \"Toque e pague\"?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Sempre usar o app <xliff:g id="APP">%1$s</xliff:g> com \"Tocar e pagar\"?"</string>
     <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Sempre usar o <xliff:g id="APP_0">%1$s</xliff:g> em vez do <xliff:g id="APP_1">%2$s</xliff:g> ao tocar e pagar?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Apps padrão"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, horário, backup e atualizações"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Procurar nas configurações"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Procurar nas configurações"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Configurações de pesquisa"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Configurações de pesquisa"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexão de rede"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensagem de texto, enviar mensagens de texto, mensagens"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, dispositivo móvel, operadora de celular, sem fio, dados, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
+    <!-- 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">"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>
@@ -2751,7 +2920,7 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> regra automática ativada</item>
       <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_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_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>
@@ -2833,8 +3002,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>
@@ -2861,8 +3028,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações na aba ou em dispositivos periféricos"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"Permitir ponto de notificação"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar ponto de notificação"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorar \"Não perturbe\""</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que as notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridade"</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -3062,14 +3224,14 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Não reconhecido"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Padrão"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Padrão para trabalho"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistente e entrada por voz"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assist. e entrada por voz"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"App de assistência"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Tornar o app <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> seu assistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"O assistente lerá informações sobre apps em uso no seu sistema, incluindo informações visíveis na tela ou as que podem ser acessadas nos apps."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceito"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Discordo"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Escolher entrada por voz"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"App de navegação"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"App de navegador"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Nenhum navegador padrão"</string>
     <string name="default_phone_title" msgid="282005908059637350">"App de telefone"</string>
     <string name="default_app" msgid="6864503001385843060">"Padrão"</string>
@@ -3095,13 +3257,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> app está com comportamento anormal</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps estão com comportamento anormal</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
+    <string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
     <string name="high_power_system" msgid="7362862974428225301">"A otimização de bateria não está disponível"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Não aplicar a otimização de bateria. Isso pode esgotar sua bateria mais rapidamente."</string>
-    <string name="high_power_prompt_title" msgid="6358673688590282655">"Permitir que o app sempre esteja em execução em segundo plano?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"A execução contínua do app <xliff:g id="APP_NAME">%1$s</xliff:g> em segundo plano pode reduzir a duração da bateria. \n\nVocê poderá alterar essa opção mais tarde em \"Configurar\" &gt; \"Apps e notificações\"."</string>
+    <string name="high_power_prompt_title" msgid="6358673688590282655">"Deseja permitir que o app sempre esteja em execução em segundo plano?"</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Permitir que <xliff:g id="APP_NAME">%1$s</xliff:g> sempre esteja em execução em segundo plano pode reduzir a duração da bateria. \n\nVocê poderá alterar essa opção mais tarde nas notificações de Configurações &gt; Apps."</string>
     <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> de uso desde a última carga completa"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Gerenciamento de energia"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Sem uso da bateria desde a última carga completa"</string>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalar apps desconhecidos"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Permissão p/ app modificar configurações do sistema"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Permitir modificação de config. do sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Permitir desta fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Girar duas vezes para abrir a câmera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
@@ -3274,7 +3441,7 @@
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Os dados em segundo plano estão disponíveis apenas via Wi-Fi. Isso poderá afetar alguns apps ou serviços quando o Wi-Fi não estiver disponível."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Perfil de trabalho desativado"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Os apps, a sincronização em segundo plano e outros recursos relacionados com seu perfil de trabalho estão desativados."</string>
-    <string name="condition_night_display_title" msgid="5599814941976856183">"O modo noturno está ativado"</string>
+    <string name="condition_night_display_title" msgid="5599814941976856183">"A Iluminação noturna está ativada"</string>
     <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>
@@ -3296,8 +3463,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 +3483,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>
@@ -3378,11 +3544,10 @@
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter…"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Redefinir limite de taxa do ShortcutManager"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"O limite de taxa do ShortcutManager foi redefinido"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Notificações da tela de bloqueio"</string>
+    <string name="notification_suggestion_title" msgid="4506524937307816475">"Controlar notificações da tela de bloqueio"</string>
     <string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o conteúdo da notificação"</string>
     <string name="page_tab_title_summary" msgid="4070309266374993258">"Todas as opções"</string>
     <string name="page_tab_title_support" msgid="6330657582897417458">"Suporte"</string>
-    <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="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>
@@ -3407,7 +3572,7 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"Tarifas internacionais podem ser aplicadas"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefone"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Bate-papo"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Conferir dicas e truques"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar dicas e truques"</string>
     <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar feedback"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Entre em contato com o suporte"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Fazer login"</string>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espaço agora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestos"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Atalhos de gestos"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestos rápidos para controlar seu smartphone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestos rápidos para controlar seu tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar seu dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Ir para a câmera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Para abrir a câmera rapidamente, pressione o botão liga/desliga duas vezes. O recurso funciona em qualquer tela."</string>
+    <!-- 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">"Virar câmera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></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>
+    <!-- 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">"Toque duas vezes na tela para verificar o smartphone"</string>
+    <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Toque duas vezes na tela para verificar o tablet"</string>
+    <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Toque duas vezes na tela para verificar o dispositivo"</string>
+    <!-- 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">"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="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>
+    <!-- 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">"Deslizar impressão digital para ver as notificações"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do smartphone."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para verificar suas notificações, deslize para baixo no sensor de impressão digital na parte traseira do dispositivo."</string>
+    <!-- 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">"Levantar para abrir a câmera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Para abrir a câmera automaticamente, levante o smartphone até uma posição de tirar fotos (paisagem ou retrato). Funciona quando o smartphone está em suspensão ou bloqueado."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Tire fotos quando o telefone estiver em repouso ou bloqueado"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto do Assistente"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Confidencialidade"</string>
@@ -3572,6 +3764,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>
@@ -3585,5 +3778,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"App instantâneo"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Desativar o gerenciador de armazenamento?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Apps de filme e televisão"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Espaço utilizado"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Informações de aprovisionamento da operadora"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
+    <!-- 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-ro/arrays.xml b/res/values-ro/arrays.xml
index b42fe5e..61604fd 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bun"</item>
     <item msgid="8986346415847956850">"Excelent"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Întotdeauna"</item>
-    <item msgid="844721238536786870">"Doar atunci când este conectat"</item>
-    <item msgid="1986753720941888596">"Niciodată"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Întotdeauna"</item>
-    <item msgid="7433294150916905997">"Doar atunci când este conectat"</item>
-    <item msgid="1390404486722375028">"Niciodată"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Ultimele 30 de zile"</item>
     <item msgid="6600989128423965319">"Setați ciclu utilizare..."</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cf0fbef..e821b03 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Refuzați"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Închideți"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Comutați"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Necunoscut"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="few">Mai aveți <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pași pentru a deveni dezvoltator.</item>
       <item quantity="other">Mai aveți <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> de pași pentru a deveni dezvoltator.</item>
@@ -31,6 +30,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 +42,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 +108,26 @@
     <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>
+    <!-- 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">"Nu aveți permisiunea de a modifica setările Bluetooth."</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> este vizibil pentru dispozitivele din apropiere când conexiunea Bluetooth este deschisă."</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">"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 +139,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +176,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dispozitivele dvs."</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Data și ora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selectați fusul orar"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -331,7 +354,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Conturi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Locație"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Securitate și locație"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Securitate și locație"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptare și date de conectare"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon criptat"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Dispozitiv criptat"</string>
@@ -357,40 +380,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +490,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 +562,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Schimbați modelul pentru deblocare"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Schimbați codul PIN de deblocare"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Schimbați parola pentru deblocare"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Încercați din nou. Încercarea <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> din <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Ultima încercare"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Dacă la această încercare introduceți un model incorect pentru serviciu, profilul de serviciu și datele asociate acestuia vor fi eliminate de pe dispozitiv."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Dacă la această încercare introduceți un cod PIN incorect pentru serviciu, profilul de serviciu și datele asociate acestuia vor fi eliminate de pe dispozitiv."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Dacă la această încercare introduceți o parolă incorectă pentru serviciu, profilul de serviciu și datele asociate acestuia vor fi eliminate de pe dispozitiv."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Prea multe încercări incorecte. Profilul dvs. de serviciu și datele asociate acestuia vor fi eliminate de pe dispozitiv."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Închideți"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Încercați din nou. Încercarea <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> din <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Datele dvs. vor fi șterse"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Dacă la următoarea încercare introduceți un model incorect, datele de pe acest dispozitiv vor fi șterse"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Dacă la următoarea încercare introduceți un cod PIN incorect, datele de pe acest dispozitiv vor fi șterse"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Dacă la următoarea încercare introduceți o parolă incorectă, datele de pe acest dispozitiv vor fi șterse"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Dacă la următoarea încercare introduceți un model incorect, acest utilizator va fi șters"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Dacă la următoarea încercare introduceți un cod PIN incorect, acest utilizator va fi șters"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Dacă la următoarea încercare introduceți o parolă incorectă, acest utilizator va fi șters"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Dacă la următoarea încercare introduceți un model incorect, profilul de serviciu și datele sale vor fi șterse"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Dacă la următoarea încercare introduceți un cod PIN incorect, profilul de serviciu și datele sale vor fi șterse"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Dacă la următoarea încercare introduceți o parolă incorectă, profilul de serviciu și datele sale vor fi șterse"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Prea multe încercări incorecte. Datele de pe acest dispozitiv vor fi șterse."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Prea multe încercări incorecte. Acest utilizator va fi șters."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Prea multe încercări incorecte. Acest profil de serviciu și datele sale vor fi șterse."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Închideți"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Trebuie să aibă cel puțin <xliff:g id="COUNT">%d</xliff:g> caractere"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Codul PIN trebuie să aibă cel puțin <xliff:g id="COUNT">%d</xliff:g> cifre"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuați"</string>
@@ -630,13 +678,29 @@
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Conectați-vă"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Deconectați"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Asociați și conectați"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Anulați asocierea"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Anulați împerecherea"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Deconectați și anulați împerecherea"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opțiuni…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avansate"</string>
     <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>
+    <!-- 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">"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>
@@ -758,7 +822,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Setarea de securitate pentru routerul wireless (TKIP) nu este acceptată"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificare eșuată. Încercați din nou."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"A fost detectată altă sesiune WPS. Încercați din nou peste câteva minute."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi deconectat. Configurarea WPS a fost anulată."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Numele rețelei"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Introduceți identificatorul SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Securitatea"</string>
@@ -822,7 +885,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 +921,28 @@
     <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>
+    <!-- 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_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">"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 +989,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>
@@ -992,23 +1074,33 @@
     <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>
+    <!-- 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">"Ora începerii"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Ora încheierii"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Activat/<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">"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>
@@ -1017,7 +1109,7 @@
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Personalizat"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Schimbați imaginea de fundal"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalizați ecranul"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Alegeți imagine de fundal din"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Alege o imagine de fundal din"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Economizor de ecran"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"În timpul încărcării sau andocării"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"În ambele situații"</string>
@@ -1032,8 +1124,19 @@
     <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>
+    <!-- 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">"Activează ecranul când primiți notificări"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Activat permanent"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Afișați ora, pictogramele pentru notificări și alte informații"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiunea fontului"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Măriți sau micșorați textul"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setări de blocare a cardului SIM"</string>
@@ -1131,7 +1234,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagini, videoclipuri"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzică, tonuri de sonerie, podcasturi etc.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"Alte fișiere"</string>
-    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Date salvate în memoria cache"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datele memorate în cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontați stocare distribuită"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demontați cardul SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontați stocarea USB internă"</string>
@@ -1209,7 +1312,7 @@
     <string name="storage_detail_images" msgid="6950678857740634769">"Imagini"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"Videoclipuri"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
-    <string name="storage_detail_cached" msgid="8547136365247818567">"Date salvate în memoria cache"</string>
+    <string name="storage_detail_cached" msgid="8547136365247818567">"Datele memorate în cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Altele"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorați <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -1286,6 +1389,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>
@@ -1316,6 +1420,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ștergeți cardul SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ștergeți toate datele din stocarea USB internă, cum ar fi muzica sau fotografiile"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ștergeți toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Ștergeți cardurile eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Ștergeți toate cardurile eSIM de pe telefon. Prin această acțiune nu vă veți anula planul de servicii mobile."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Ștergeți toate cardurile eSIM de pe telefon. Prin această acțiune nu vă veți anula planul de servicii mobile."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetați tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetați telefonul"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Ștergeți toate datele personale și aplicațiile descărcate? Nu puteți anula această acțiune!"</string>
@@ -1338,26 +1445,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1491,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>
@@ -1505,6 +1606,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1565,6 +1672,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Rulează"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stocare USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pe cardul SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Dezactivată"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nu este instal. pt. utilizator"</string>
     <string name="installed" msgid="3070865169422600098">"Instalată"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nu există aplicații."</string>
@@ -1674,6 +1782,11 @@
     <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>
+    <!-- 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">"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>
@@ -1894,6 +2007,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 +2078,46 @@
     <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>
+    <!-- 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">"Ecran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lanternă"</string>
     <string name="power_camera" msgid="4976286950934622605">"Cameră foto"</string>
@@ -1974,7 +2132,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2185,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2680,17 +2841,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicații prestabilite"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Limbi, oră, backup, actualizări"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Setări"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Căutați în setări"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Căutați în setări"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Setări de căutare"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Setări pentru căutare"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, conexiune la rețea"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mesaj text, trimitere mesaje text, mesaje, trimitere mesaje"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, mobil, operator servicii mobile, wireless, date, 4g, 3g, 2g, lte"</string>
@@ -2735,6 +2899,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"plată, atingere, plăți"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup"</string>
+    <!-- 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">"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>
@@ -2861,8 +3031,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>
@@ -2997,11 +3165,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 +3172,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 +3294,13 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3224,8 +3394,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalare apl. necunoscute"</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>
@@ -3237,8 +3408,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Permisiune aplicație modificare setări de sistem"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Permiteți modificarea setărilor de sistem"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Având această permisiune, o aplicație poate să modifice setările de sistem."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nu"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Permiteți din această sursă"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Două răsuciri pentru camera foto"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Deschideți aplicația Cameră foto răsucind din încheietura mâinii de două ori"</string>
@@ -3334,8 +3503,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 +3525,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>
@@ -3423,7 +3591,6 @@
     <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="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>
@@ -3491,28 +3658,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automat"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuale"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Eliberați spațiu acum"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gesturi"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Comenzi rapide pentru gesturi"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gesturi rapide pentru a controla telefonul"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gesturi rapide pentru controlul tabletei"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gesturi rapide pentru controlul dispozitivului"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accesați camera foto"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pentru a deschide rapid camera foto, apăsați de două ori butonul de pornire. Funcționează de pe orice ecran."</string>
+    <!-- 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">"Comutați camera foto"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Ridicați pentru a deschide camera foto"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Pentru a deschide automat camera foto, ridicați telefonul în poziție de fotografiat (portret sau peisaj). Funcționează când telefonul este în modul inactiv sau blocat."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotografiați când telefonul este în modul inactiv sau blocat"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gest pentru asistență"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilitate"</string>
@@ -3623,6 +3817,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 +3831,10 @@
     <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>
+    <!-- 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-ru/arrays.xml b/res/values-ru/arrays.xml
index 1f47436..621dd40 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Хороший"</item>
     <item msgid="8986346415847956850">"Отличный"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Не выключать"</item>
-    <item msgid="844721238536786870">"Только при питании от сети"</item>
-    <item msgid="1986753720941888596">"Всегда выключать"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Не выключать"</item>
-    <item msgid="7433294150916905997">"Только при питании от сети"</item>
-    <item msgid="1390404486722375028">"Всегда выключать"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"За последние 30 дней"</item>
     <item msgid="6600989128423965319">"Цикл использования данных"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 88fb2d8..eaa07de 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/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">"Подключения"</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">"Устройства поблизости могут обнаружить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, пока открыты настройки Bluetooth."</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">"Нажмите, чтобы установить соединение с устройством \"<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-карте. Если вы его предоставите, будет установлено соединение, на время которого будут отключены все сервисы передачи данных. Открыть доступ устройству \"<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) -->
@@ -333,7 +356,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 +383,55 @@
     <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>
@@ -455,6 +493,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 +565,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Изменить графический ключ разблокировки"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Изменить ПИН-код разблокировки"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Изменить пароль разблокировки"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Попробуйте ещё раз. Попытка <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> из <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Последняя попытка"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Если вы неправильно введете графический ключ, ваш рабочий профиль и связанные с ним данные будут удалены с устройства."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Если вы неправильно введете PIN-код, ваш рабочий профиль и связанные с ним данные будут удалены с устройства."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Если вы неправильно введете пароль, ваш рабочий профиль и связанные с ним данные будут удалены с устройства."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"У вас больше нет попыток. Рабочий профиль и связанные с ним данные будут удалены с устройства."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Закрыть"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Попробуйте ещё раз. Попытка <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> из <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Осталась одна попытка"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Если вы неправильно введете графический ключ, с устройства будут удалены все данные."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Если вы неправильно введете PIN-код, с устройства будут удалены все данные."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Если вы неправильно введете пароль, с устройства будут удалены все данные."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Если вы неправильно введете графический ключ, этот пользователь будет удален."</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Если вы неправильно введете PIN-код, этот пользователь будет удален."</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Если вы неправильно введете пароль, этот пользователь будет удален."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Если вы неправильно введете графический ключ, ваш рабочий профиль и его данные будут удалены."</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Если вы неправильно введете PIN-код, ваш рабочий профиль и его данные будут удалены."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Если вы неправильно введете пароль, ваш рабочий профиль и его данные будут удалены."</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Слишком много неудачных попыток. С устройства будут удалены все данные."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Слишком много неудачных попыток. Этот пользователь будет удален."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Слишком много неудачных попыток. Этот рабочий профиль и его данные будут удалены."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Закрыть"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Должно быть не менее <xliff:g id="COUNT">%d</xliff:g> символов"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Должно быть не менее <xliff:g id="COUNT">%d</xliff:g> символов"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продолжить"</string>
@@ -608,8 +656,8 @@
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</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_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_enter_passkey_msg" msgid="6813273136442138444">"Введите код подключения и нажмите клавишу ввода"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN-код содержит буквы или символы"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Обычно 0000 или 1234"</string>
@@ -635,7 +683,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>
@@ -648,6 +696,22 @@
     <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>
+    <!-- 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>
@@ -691,7 +755,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 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>
@@ -769,7 +833,6 @@
     <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_ssid" msgid="5519636102673067319">"Имя сети"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Введите имя сети (SSID)"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Защита"</string>
@@ -834,7 +897,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 +933,28 @@
     <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>
+    <!-- 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_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">"Включение точки доступа…"</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 +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">"Адрес, по которому будут направлены экстренные службы в случае вызова по номеру 112 через сеть Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
@@ -1004,23 +1086,33 @@
     <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>
-    <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>
+    <!-- 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>
@@ -1044,8 +1136,19 @@
     <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>
+    <!-- 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>
@@ -1299,6 +1402,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>
@@ -1311,7 +1415,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="one">Будет сброшен <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунт</item>
       <item quantity="few">Будет сброшено <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунта</item>
@@ -1330,6 +1434,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Очистить SD-карту"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Удалить с USB-накопителя музыку, фотографии и все остальные данные."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Удалить с SD-карты все данные, в том числе музыку и фотографии"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Удалить все данные eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Удалить все данные eSIM на телефоне (вы не потеряете доступ к услугам оператора связи)"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Удалить все данные eSIM на планшете (вы не потеряете доступ к услугам оператора связи)"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Сбросить настройки планшета"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Сбросить настройки телефона"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Удалить всю личную информацию и скачанные приложения? Это действие нельзя отменить."</string>
@@ -1352,30 +1459,24 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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="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>
@@ -1404,7 +1505,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>
@@ -1519,6 +1620,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1580,6 +1687,7 @@
     <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="default" msgid="1477351142334784771">"На SD-карте"</string>
+    <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>
@@ -1689,6 +1797,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Помощь при вводе"</string>
@@ -1915,6 +2028,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 +2100,46 @@
     <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>
@@ -1995,7 +2154,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>
@@ -2047,12 +2207,14 @@
     <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>
+    <!-- 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_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>
@@ -2557,7 +2719,7 @@
     <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_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>
@@ -2629,7 +2791,7 @@
     <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="cell_broadcast_settings" msgid="2451014351355183338">"Уведомления о чрезвычайных ситуациях"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Операторы связи"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Названия точек доступа"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Режим 4G LTE"</string>
@@ -2706,9 +2868,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>
@@ -2761,6 +2926,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">"Настройка NFC-метки"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Нажмите на метку, чтобы начать запись..."</string>
@@ -2795,7 +2966,7 @@
     <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_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>
@@ -2846,7 +3017,7 @@
     <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="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>
@@ -2889,13 +3060,11 @@
     <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="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>
@@ -2919,8 +3088,8 @@
     <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="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>
@@ -2964,8 +3133,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>
@@ -3029,11 +3198,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 +3205,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,13 +3331,21 @@
     <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>
+    <!-- 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="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>
@@ -3261,8 +3433,9 @@
     <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="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>
@@ -3274,8 +3447,6 @@
     <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_switch_title" msgid="3621381992793251070">"Разрешить установку из этого источника"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Включать камеру движением запястья"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Чтобы открыть приложение \"Камера\", дважды поверните запястье."</string>
@@ -3372,8 +3543,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 +3567,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>
@@ -3460,11 +3630,10 @@
     <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">"Готово"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"Уведомления на заблоки­рованном экране"</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="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>
@@ -3478,15 +3647,15 @@
     <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_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_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_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_chat" msgid="977019859110763749">"Написать в чате"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Рекомендации и полезные советы"</string>
@@ -3535,28 +3704,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>
+    <!-- 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 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>
@@ -3674,6 +3870,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 +3884,10 @@
     <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>
+    <!-- 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-si/arrays.xml b/res/values-si/arrays.xml
index 3745655..aa1a012 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"හොඳ"</item>
     <item msgid="8986346415847956850">"ඉතා හොඳ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"සැමවිටම"</item>
-    <item msgid="844721238536786870">"පේනුව ගත කළ විට පමණක්"</item>
-    <item msgid="1986753720941888596">"කවදාවත් නොවේ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"සැමවිටම"</item>
-    <item msgid="7433294150916905997">"පේනුව සක්‍රිය කලවිට පමණක්"</item>
-    <item msgid="1390404486722375028">"කවදාවත් නොවේ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"අවසන් දින 30"</item>
     <item msgid="6600989128423965319">"භාවිත කිරීමේ කවය සකසන්න..."</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 508fdd8..225f541 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -23,13 +23,13 @@
     <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="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="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 +41,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 +107,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">"බ්ලූටූත් සැකසීම් වෙනස් කිරීමට ඔබට අවසර නැත."</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> දර්ශනය වේ."</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"අගුළු ඇරීමේ රටාව වෙනස් කරන්න"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"අගුළු ඇරීමේ PIN එක වෙනස් කරන්න"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"අඟුළු හැරීමේ මුරපදය වෙනස් කරන්න"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"නැවත උත්සාහ කරන්න. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>කින් <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> උත්සාහය."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"අවසන් උත්සාහ කිරීම"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"ඔබ මෙම උත්සාහයේදී වැරදි කාර්යාල රටාවක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ සම්බන්ධිත දත්ත මෙම උපාංගය වෙතින් ඉවත් කරනු ඇත."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ඔබ මෙම උත්සාහයේදී වැරදි කාර්යාල PIN අංකයක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ සම්බන්ධිත දත්ත මෙම උපාංගය වෙතින් ඉවත් කරනු ඇත."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ඔබ මෙම උත්සාහයේදී වැරදි කාර්යාල මුරපදයක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ සම්බන්ධිත දත්ත මෙම උපාංගය වෙතින් ඉවත් කරනු ඇත."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"වැරදි උත්සාහයන් ඉතා වැඩි ගණනකි. ඔබේ කාර්යාල පැතිකඩ සහ සම්බන්ධිත දත්ත මෙම උපාංගය වෙතින් ඉවත් කරනු ඇත."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ඉවතලන්න"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"නැවත උත්සාහ කරන්න. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>කින් <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> උත්සාහය."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ඔබගේ දත්ත මකනු ඇත"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"ඔබ ඊළඟ උත්සාහයේදී වැරදි රටාවක් ඇතුළු කළහොත්, මෙම උපාංගයෙහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"ඔබ ඊළඟ උත්සාහයේදී වැරදි PIN එකක් ඇතුළු කළහොත්, මෙම උපාංගයෙහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"ඔබ ඊළඟ උත්සාහයේදී වැරදි මුරපදයක් ඇතුළු කළහොත්, මෙම උපාංගයෙහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"ඔබ ඊළඟ උත්සාහයේදී වැරදි රටාවක් ඇතුළු කළහොත්, මෙම පරිශීලකයා මකනු ඇත"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"ඔබ ඊළඟ උත්සාහයේදී වැරදි PIN එකක් ඇතුළු කළහොත්, මෙම පරිශීලකයා මකනු ඇත"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"ඔබ ඊළඟ උත්සාහයේදී වැරදි මුරපදයක් ඇතුළු කළහොත්, මෙම පරිශීලකයා මකනු ඇත"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"ඔබ ඊළඟ උත්සාහයේදී වැරදි රටාවක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ එහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"ඔබ ඊළඟ උත්සාහයේදී වැරදි PIN එකක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ එහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"ඔබ ඊළඟ උත්සාහයේදී වැරදි මුරපදයක් ඇතුළු කළහොත්, ඔබේ කාර්යාල පැතිකඩ සහ එහි දත්ත මකනු ඇත"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"වැරදි උත්සාහයන් ඉතා වැඩි ගණනකි. මෙම උපාංගයෙහි දත්ත මකනු ඇත."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"වැරදි උත්සාහයන් ඉතා වැඩි ගණනකි. මෙම පරිශීලකයා මකනු ඇත."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"වැරදි උත්සාහයන් ඉතා වැඩි ගණනකි. මෙම කාර්යාල පැතිකඩ සහ එහි දත්ත මකනු ඇත."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ඉවතලන්න"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"අඩු තරමින් අකුරු <xliff:g id="COUNT">%d</xliff:g>ක් තිබිය යුතුය"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN එකෙහි අඩු තරමින් සංඛ්‍යාමය ඉලක්කම් <xliff:g id="COUNT">%d</xliff:g>ක් තිබිය යුතුය"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"කරගෙන යන්න"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"ජාල නම"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID ඇතුලත් කරන්න"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ආරක්ෂාව"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"හොට්ස්පොට් සක්‍රිය කරමින්..."</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN හිස් විය නොහැක."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ක්ෂේත්‍රය සංඛ්‍යා 3 ක් විය යුතුය."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ක්ෂේත්‍රය ඉලක්කම් 2 ක් හෝ 3 ක් විය යුතුය."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"වාහකය %s වර්ගයේ APN එක් කිරීම සඳහා සහාය නොදක්වයි."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"සුපුරුදු APN සැකසුම් යළි පිහිටුවමින්."</string>
     <string name="menu_restore" msgid="8260067415075573273">"සුපුරුදු වෙත යළි සකසන්න"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"සුපුරුදු APN සැකසීම නැවත සැකසීම සම්පූර්ණ කරන ලදි."</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD කාඩ් පත මකන්න"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"සංගීත හෝ ජායාරුප ආදී අභ්‍යන්තර USB ආචයනයේ සියලු දත්ත මකන්න"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"සංගීත හෝ ඡායාරූප ආදී SD කාඩ් පතේ සියලු දත්ත මකන්න"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMs මකන්න"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"දුරකථනයෙහි සියලු eSIMs මකන්න. මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ටැබ්ලට් පරිගණකයෙහි සියලු eSIMs මකන්න. මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ටැබ්ලටය යළි සකසන්න"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"දුරකථනය නැවත සකසන්න"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"ඔබගේ සියලු පෞද්ගලික තොරතුරු සහ බාගත කළ යෙදුම් මකන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැක!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SD කාඩ් පතෙහි තිබෙන"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ආදාන සහය"</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"CPU මුළු ගණන"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"පෙරබිම් CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"අවදිව සිටින්න"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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="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>
@@ -2654,9 +2814,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>
@@ -2709,6 +2872,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>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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 +3257,12 @@
     <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>
+    <!-- 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>
@@ -3187,8 +3355,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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"මෙම මූලාශ්‍රයෙන් ඉඩ දෙන්න"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"කැමරාව සඳහා දෙවරක් කරකවන්න"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"ඔබේ මැණික් කටුව දෙවරක් කරකවා කැමරා යෙදුම විවෘත කරන්න"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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_warning" msgid="9086859595338944882">"වාරික SMS ඔබෙන් මුදල් අය කළ හැකි අතර ඔබේ වාහක බිල්පතට එක් කරනු ඇත. ඔබ යෙදුමක් සඳහා අවසර සබල කරන්නේ නම්, ඔබට එම යෙදුම භාවිතයෙන් වාරික SMS යැවීමට හැකි වනු ඇත."</string>
@@ -3447,28 +3612,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-sk/arrays.xml b/res/values-sk/arrays.xml
index cd29ee5..90cc3ec 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobré"</item>
     <item msgid="8986346415847956850">"Vynikajúce"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Vždy"</item>
-    <item msgid="844721238536786870">"Iba počas napájania"</item>
-    <item msgid="1986753720941888596">"Nikdy"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Vždy"</item>
-    <item msgid="7433294150916905997">"Iba počas napájania"</item>
-    <item msgid="1390404486722375028">"Nikdy"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Posledných 30 dní"</item>
     <item msgid="6600989128423965319">"Nastaviť cyklus využitia"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ba325ce..413164f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odmietnuť"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zavrieť"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Prepnúť"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Neznáme"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="few">Ešte <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> krok a bude z vás vývojár.</item>
       <item quantity="many">Ešte <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroka a bude z vás vývojár.</item>
@@ -32,6 +31,7 @@
     </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Teraz ste vývojár!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nie je to potrebné, už ste vývojár."</string>
+    <string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Najprv povoľte možnosti pre vývojárov"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezdrôtové pripojenia a siete"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Pripojenia"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Zariadenie"</string>
@@ -43,6 +43,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"Poskytované VoLTE"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Poskytované videohovory"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Poskytované volanie cez Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Zaistenie EAB/Presence"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Sila signálu GSM"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Zobraziť adresár SIM karty"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Zobraziť povolené čísla"</string>
@@ -108,10 +109,26 @@
     <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>
+    <!-- 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">"Nemáte povolenie na zmenu nastavení Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +140,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +177,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše zariadenia"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Dátum a čas"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Zvoľte časové pásmo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -333,7 +356,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Účty"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Zabezpečenie a poloha"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Zabezpečenie a poloha"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrovanie a poverenia"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefón zašifrovaný"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Zariadenie je šifrované"</string>
@@ -360,40 +383,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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č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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrácia nebola dokončená"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Časový limit registrácie odtlačku prsta vypršal. Skúste to znova."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrácia odtlačku prsta nefungovala. Skúste to znova alebo použite iný prst."</string>
@@ -455,6 +493,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto zariadenia bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto telefónu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Zvoľte dodatočnú metódu zámky obrazovky"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Možnosti zámky obrazovky"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Možnosti zámky obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámka obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / okamžite po spánku"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / <xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> po spánku"</string>
@@ -525,13 +565,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Zmena bezpečnostného vzoru"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmena bezpečnostného kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmeniť bezpečnostné heslo"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Skúste to znova. Pokus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Posledný pokus"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ak pri tomto pokuse zadáte nesprávny pracovný vzor, váš pracovný profil a združené údaje budú z tohto zariadenia odstránené."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ak pri tomto pokuse zadáte nesprávny pracovný kód PIN, váš pracovný profil a združené údaje budú z tohto zariadenia odstránené."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ak pri tomto pokuse zadáte nesprávne pracovné heslo, váš pracovný profil a združené údaje budú z tohto zariadenia odstránené."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Príliš veľa chybných pokusov. Váš pracovný profil a združené údaje budú z tohto zariadenia odstránené."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Odmietnuť"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Skúste to znova. Pokus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> z <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaše dáta budú odstránené"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ak pri ďalšom pokuse zadáte nesprávny vzor, dáta tohto zariadenia budú odstránené"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ak pri ďalšom pokuse zadáte nesprávny kód PIN, dáta tohto zariadenia budú odstránené"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ak pri ďalšom pokuse zadáte nesprávne heslo, dáta tohto zariadenia budú odstránené"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ak pri ďalšom pokuse zadáte nesprávny vzor, tento používateľ bude odstránený"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ak pri ďalšom pokuse zadáte nesprávny kód PIN, tento používateľ bude odstránený"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ak pri ďalšom pokuse zadáte nesprávne heslo, tento používateľ bude odstránený"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ak pri ďalšom pokuse zadáte nesprávny vzor, váš pracovný profil a jeho dáta budú odstránené"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ak pri ďalšom pokuse zadáte nesprávny kód PIN, váš pracovný profil a jeho dáta budú odstránené."</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ak pri ďalšom pokuse zadáte nesprávne heslo, váš pracovný profil a jeho dáta budú odstránené"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Príliš veľa chybných pokusov. Dáta tohto zariadenia budú odstránené."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Príliš veľa chybných pokusov. Tento používateľ bude odstránený."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Príliš veľa chybných pokusov. Tento pracovný profil a jeho dáta budú odstránené."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Zatvoriť"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Musí obsahovať aspoň tento počet znakov: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN musí obsahovať aspoň tento počet čísel: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovať"</string>
@@ -648,6 +696,22 @@
     <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>
+    <!-- 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">"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>
@@ -769,7 +833,6 @@
     <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_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>
@@ -834,7 +897,6 @@
       <item quantity="one">1 sieť</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi, rozšírené"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurácia Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresa IP"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsiete"</string>
@@ -871,9 +933,28 @@
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstrániť túto skupinu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosný hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Hotspot Wi‑Fi"</string>
-    <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Poskytovať Wi-Fi pomocou mobilného pripojenia"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internetové pripojenie tohto tabletu sa nezdieľa cez hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internetové pripojenie tohto telefónu sa nezdieľa cez hotspot"</string>
+    <!-- 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_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">"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>
@@ -920,6 +1001,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Ak je zapnuté volanie Wi-Fi, váš telefón môže smerovať volania cez siete Wi-Fi alebo cez sieť vášho operátora. Závisí to od vašich nastavení a od toho, ktorý signál je silnejší. Pred zapnutím tejto funkcie kontaktujte svojho operátora a informujte sa o poplatkoch a ďalších podrobnostiach."</string>
+    <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="3571902448699714454">"Aktualizácia tiesňovej adresy"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"Adresa, ktorej polohu použijú tiesňové služby, keď zavoláte linku 112 pomocou Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
@@ -1004,34 +1086,44 @@
     <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>
+    <!-- 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">"Čas začiatku"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Čas ukončenia"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Zapnuté / <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">"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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Predvolené"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Vlastná"</string>
-    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Zmeniť tapetu"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Zmena tapety"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Prispôsobte si obrazovku"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Šetrič obrazovky"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Pri nabíjaní alebo v doku"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Počas nabíjania alebo v doku"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"V oboch prípadoch"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pri nabíjaní"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Pri vložení do doku"</string>
@@ -1044,8 +1136,19 @@
     <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>
+    <!-- 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">"Prebudiť obrazovku, keď dostanete upozornenie"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Vždy zapnuté"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Zobrazovať čas, ikony upozornení a ďalšie informácie"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Zväčšite alebo zmenšite text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavenia zámky SIM karty"</string>
@@ -1199,10 +1302,10 @@
     <string name="storage_other_users" msgid="808708845102611856">"Ďalší používatelia"</string>
     <string name="storage_internal_title" msgid="690771193137801021">"Úložisko zariadenia"</string>
     <string name="storage_external_title" msgid="3433462910096848696">"Prenosné úložisko"</string>
-    <string name="storage_volume_summary" msgid="7023441974367853372">"Využité <xliff:g id="USED">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="storage_volume_summary" msgid="7023441974367853372">"Využité miesto: <xliff:g id="USED">%1$s</xliff:g> z <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">"Využité z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_volume_used_total" msgid="6113121714019000244">"Celkove využité z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used_total" msgid="6113121714019000244">"Celkové využité miesto z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"Úložisko (<xliff:g id="NAME">%1$s</xliff:g>) je pripojené"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"Úložisko (<xliff:g id="NAME">%1$s</xliff:g>) sa nepodarilo pripojiť"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"Úložisko (<xliff:g id="NAME">%1$s</xliff:g>) bolo bezpečne odpojené"</string>
@@ -1299,6 +1402,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>
@@ -1330,6 +1434,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Vymazať SD kartu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Vymazať všetky dáta v internom úložisku USB, napríklad hudbu a fotky"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Vymazať všetky dáta na SD karte, napríklad hudbu a fotky"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Vymazať eSIM karty"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Vymažte všetky eSIM karty na telefóne. Nezrušíte tým svoj plán mobilných služieb."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Vymažte všetky eSIM karty na tablete. Nezrušíte tým svoj plán mobilných služieb."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetovať tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetovať telefón"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Chcete vymazať všetky osobné údaje a stiahnuté aplikácie? Túto akciu nebude možné vrátiť späť."</string>
@@ -1352,26 +1459,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1404,7 +1505,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim polohy"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Na určenie polohy používať GPS, Wi-Fi, Bluetooth alebo mobilné siete"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Na určenie polohy používať Wi-Fi, Bluetooth alebo mobilné siete"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Na určenie polohy používať GPS"</string>
+    <string name="location_mode_sensors_only_description" msgid="7247994752324805202">"Na určenie polohy používať GPS a senzory zariadenia"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Vyhľadávanie"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhľadávať siete Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Vylepšite určovanie polohy tým, že systémovým aplikáciám a službám umožníte kedykoľvek rozpoznávať siete Wi-Fi."</string>
@@ -1519,13 +1620,19 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Povoliť ďalšie možnosti nastavení"</string>
     <string name="application_info_label" msgid="5736524913065714880">"O aplikácii"</string>
     <string name="storage_label" msgid="8700867073480107253">"Úložisko"</string>
-    <string name="auto_launch_label" msgid="2669236885531442195">"Predvolené otváranie"</string>
+    <string name="auto_launch_label" msgid="2669236885531442195">"Nastavenie predvoleného otvárania"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Predvolené"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilita obrazovky"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Povolenia"</string>
@@ -1580,6 +1687,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Spustené"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Ukladací priestor USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD karte"</string>
+    <string name="disabled" msgid="9206776641295849915">"Zakázané"</string>
     <string name="not_installed" msgid="2797554494953450291">"Pre tohto používateľa nenainš."</string>
     <string name="installed" msgid="3070865169422600098">"Nainštalované"</string>
     <string name="no_applications" msgid="7336588977497084921">"Žiadne aplikácie."</string>
@@ -1689,6 +1797,11 @@
     <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>
+    <!-- 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">"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>
@@ -1790,7 +1903,7 @@
     <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>
-    <string name="interaction_control_category_title" msgid="7836591031872839151">"Interaktívne ovládanie"</string>
+    <string name="interaction_control_category_title" msgid="7836591031872839151">"Ovládacie prvky interakcie"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Stiahnuté služby"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"Experimentálne"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
@@ -1915,6 +2028,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>
@@ -1962,7 +2081,7 @@
     <string name="battery_since_reset" msgid="7464546661121187045">"Využitie batérie od obnovenia"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na batérii"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> od odpojenia"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Nabíja sa"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Nabíjanie"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Obrazovka zapnutá"</string>
     <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>
@@ -1981,6 +2100,46 @@
     <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>
+    <!-- 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">"Obrazovka"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svetlo"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparát"</string>
@@ -1995,7 +2154,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -2047,6 +2207,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2473,7 +2635,7 @@
     <string name="vpn_missing_cert" msgid="5357192202207234745">"Chýba certifikát. Skúste upraviť profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Systém"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Používateľ"</string>
-    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktivovať"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Zakázať"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Povoliť"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Odstrániť"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Dôverovať"</string>
@@ -2495,7 +2657,7 @@
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Nastaviť heslo"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Zrušiť"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Ďalšie aktualizácie systému"</string>
-    <string name="selinux_status_disabled" msgid="924551035552323327">"Deaktivované"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Zakázané"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Mierne"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Prísne"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Sieť môže byť monitorovaná"</string>
@@ -2621,7 +2783,7 @@
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Prijímať upozornenia na extrémne ohrozenie života a majetku"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Závažné hrozby"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"Prijímať upozornenia na závažné ohrozenie života a majetku"</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"Upozornenia Amber"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"Upozornenia AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Prijímať bulletiny o únosoch detí"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Opakovať"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"Povoliť nástroj Správca hovorov"</string>
@@ -2706,17 +2868,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Predvolené aplikácie"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Jazyky, čas, zálohovanie, aktualizácie"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavenia"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Hľadať v nastaveniach"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Hľadať v nastaveniach"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Nastavenia vyhľadávania"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Nastavenia vyhľadávania"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, sieťové pripojenie"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"textová správa, poslať textovú správu, správy, posielanie textových správ"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilné, mobil, mobilný operátor, bezdrôtové, dáta, 4g, 3g, 2g, lte"</string>
@@ -2761,6 +2926,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"platiť, klepnutie, platby"</string>
     <string name="keywords_backup" msgid="470070289135403022">"záloha, zálohovanie"</string>
+    <!-- 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">"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>
@@ -2782,7 +2953,7 @@
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Predvolený zvuk upozornenia"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Zvuk z aplikácie"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"Predvolený zvuk upozornenia"</string>
-    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Predvolený zvuk budíkov"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Predvolený zvuk budíka"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Pri hovoroch aj vibrovať"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Iné zvuky"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Zvuky číselnej klávesnice"</string>
@@ -2833,7 +3004,7 @@
     <string name="advanced_section_header" msgid="8833934850242546903">"Rozšírené"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Pracovné upozornenia"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Povoliť bodky upozornení"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"Blikať"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Blikanie"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na uzamknutej obrazovke"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazovať všetok obsah upozornení"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skryť citlivý obsah upozornení"</string>
@@ -2885,12 +3056,10 @@
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Znížiť blikanie"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Obraz v obraze"</string>
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Žiadna z nainštalovaných aplikácií nepodporuje obraz v obraze"</string>
-    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"obraz v obraze"</string>
+    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip, obraz v"</string>
     <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>
@@ -2919,17 +3088,17 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Tieto upozornenia nikdy nezobrazovať"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Zobrazovať upozornenia"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikdy nezobrazovať upozornenia na paneli ani v periférnych zariadeniach"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"Povoliť bodku upozornení"</string>
-    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Zobrazovať bodku upozornení"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Prekonať režim Nerušiť"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Povoliť týmto upozorneniam vyrušiť ma, ak je v nastavení Nerušiť vybraná možnosť Iba prioritné"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"Povoliť bodku upozornenia"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Zobrazovať bodku upozornenia"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Prepísať možnosť Nerušiť"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožniť týmto upozorneniam vyrušiť ma, ak je možnosť Nerušiť nastavená na možnosť Iba prioritné"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na uzamknutej obrazovke"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokované"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorita"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Citlivé"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Dôležitosť"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"Blikať"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Blikanie"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibrovať"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"Zvuk"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Odstrániť"</string>
@@ -2965,7 +3134,7 @@
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Žiadne"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Každý deň"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Budík môže prepísať čas ukončenia"</string>
-    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Ukončiť vo vybranom čase alebo pri ďalšom budíku (podľa toho, čo nastane skôr)"</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Zastaviť v čase ukončenia alebo v čase spustenia ďalšieho budíka (podľa toho, čo nastane skôr)"</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">"Od <xliff:g id="START">%1$s</xliff:g> do <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -3029,11 +3198,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 +3205,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>
@@ -3054,13 +3218,13 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Informácie o kóde IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Informácie súvisiace s kódom IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
-    <string name="launch_by_default" msgid="1840761193189009248">"Predvolené otváranie"</string>
+    <string name="launch_by_default" msgid="1840761193189009248">"Nastavenie predvoleného otvárania"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Otváranie odkazov"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Otvoriť podporované odkazy"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Otvárať bez opýtania"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Podporované odkazy"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Ďalšie predvolené"</string>
-    <string name="storage_summary_format" msgid="5419902362347539755">"Využité <xliff:g id="SIZE">%1$s</xliff:g>, <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> – využité miesto <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Interné úložisko"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Externé úložisko"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Spotreba dát aplikáciou"</string>
@@ -3114,7 +3278,7 @@
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurácia aplikácií"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznáma aplikácia"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Povolenia aplikácií"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikácie, používajúce povolenia <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikácie používajúce <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Zobudiť klepnutím"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Zariadenie prebudíte dvojitým klepnutím na ľubovoľné miesto na obrazovke."</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Otváranie odkazov"</string>
@@ -3165,8 +3329,16 @@
     <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">"Optimalizácia batérie"</string>
     <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="show_all_apps" msgid="1512506948197818534">"Zobraziť úplné využitie v zariadení"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Zobraziť využitie aplikácií"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Vysoká spotreba"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikácie s abnormálnym správaním</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> aplikácie s abnormálnym správaním</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikácií s abnormálnym správaním</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> aplikácia s abnormálnym správaním</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3433,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Inštalácia neznámych aplikácií"</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>
@@ -3274,8 +3447,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Povolenie pre aplikáciu na úpravy nastavení systému"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Povoliť úpravy nastavení systému"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Toto povolenie umožňuje aplikácii upravovať nastavenia systému."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Áno"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Povoliť z tohto zdroja"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Fotoaparát – dvakrát pokrúťte zápästím"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvorte aplikáciu fotoaparátu tak, že dvakrát pokrútite zápästím"</string>
@@ -3372,8 +3543,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Dátové upozornenie <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Dátové upozornenie <xliff:g id="ID_1">%1$s</xliff:g> / dátový limit <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturačný cyklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Cyklus sa začína každý <xliff:g id="ID_1">%1$s</xliff:g>. deň mesiaca"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mesačne od <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Každý mesiac v <xliff:g id="ID_1">%1$s</xliff:g>. deň"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Obmedzenia siete"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> obmedzenia</item>
@@ -3397,7 +3567,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>
@@ -3409,7 +3579,7 @@
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Na spustenie zariadenia sa bude vyžadovať bezpečnostný vzor. Keď je zariadenie vypnuté, nemôže prijímať hovory, správy, upozornenia ani používať budíky"</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Na spustenie zariadenia sa bude vyžadovať kód PIN. Keď je zariadenie vypnuté, nemôže prijímať hovory, správy, upozornenia ani používať budíky"</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Na spustenie zariadenia sa bude vyžadovať heslo. Keď je zariadenie vypnuté, nemôže prijímať hovory, správy, upozornenia ani používať budíky."</string>
-    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Pridať ďalší odtlačok"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Pridanie ďalšieho odtlačku"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Odomknutie pomocou iného odtlačku"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Zapnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Vypnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3464,7 +3634,6 @@
     <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="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>
@@ -3535,28 +3704,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automaticky"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ručne"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Uvoľniť miesto"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gestá"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Skratky gest"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Rýchle gestá na ovládanie telefónu"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Rýchle gestá na ovládanie tabletu"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Rýchle gestá na ovládanie zariadenia"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Spustiť fotoaparát"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Fotoaparát rýchlo otvoríte dvojitým stlačením vypínača. Funguje to na každej obrazovke."</string>
+    <!-- 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">"Prepnúť fotoaparáty"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Zdvihnutím spustite fotoaparát"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Ak chcete automaticky otvoriť fotoaparát, zdvihnite telefón do polohy na fotenie (na šírku alebo na výšku). Funguje, aj keď je telefón v režime spánku alebo uzamknutý."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Foťte, keď je telefón v režime spánku alebo uzamknutý"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto asistencie"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Citlivosť"</string>
@@ -3674,6 +3870,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 +3884,10 @@
     <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>
+    <!-- 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-sl/arrays.xml b/res/values-sl/arrays.xml
index a07385c..4e034f3 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Dobro"</item>
     <item msgid="8986346415847956850">"Odlično"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Vedno"</item>
-    <item msgid="844721238536786870">"Samo, ko je priključen"</item>
-    <item msgid="1986753720941888596">"Nikoli"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Vedno"</item>
-    <item msgid="7433294150916905997">"Samo, ko je priključen"</item>
-    <item msgid="1390404486722375028">"Nikoli"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Zadnjih 30 dni"</item>
     <item msgid="6600989128423965319">"Nastav. cikla porabe ..."</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index cf44177..8d229b2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Zavrni"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zapri"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Preklopi"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Neznano"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak vas loči od tega, da postanete razvijalec.</item>
       <item quantity="two"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka vas ločita od tega, da postanete razvijalec.</item>
@@ -32,6 +31,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 +43,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 +109,26 @@
     <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>
+    <!-- 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">"Nimate dovoljenja za spreminjanje nastavitev za Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +140,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +177,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše naprave"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +356,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 +383,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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 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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"Ž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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +493,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 +565,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Spremeni vzorec za odklepanje"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Spremeni kodo PIN za odklepanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Spremeni geslo za odklepanje"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Poskusite znova. Poskus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Zadnji poskus"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Če tudi tokrat vnesete nepravilni vzorec za delovni profil, bodo delovni profil in povezani podatki odstranjeni iz te naprave."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Če tudi tokrat vnesete nepravilno kodo PIN za delovni profil, bodo delovni profil in povezani podatki odstranjeni iz te naprave."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Če tudi tokrat vnesete nepravilno geslo za delovni profil, bodo delovni profil in povezani podatki odstranjeni iz te naprave."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Preveč napačnih poskusov. Delovni profil in povezani podatki bodo odstranjeni iz te naprave."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Opusti"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Poskusite znova. Poskus <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> od <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Vaši podatki bodo izbrisani"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Če pri naslednjem poskusu vnesete napačen vzorec, bodo podatki v tej napravi izbrisani"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Če pri naslednjem poskusu vnesete napačno kodo PIN, bodo podatki v tej napravi izbrisani"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Če pri naslednjem poskusu vnesete napačno geslo, bodo podatki v tej napravi izbrisani"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Če pri naslednjem poskusu vnesete napačen vzorec, bo uporabnik izbrisan"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Če pri naslednjem poskusu vnesete napačno kodo PIN, bo uporabnik izbrisan"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Če pri naslednjem poskusu vnesete napačno geslo, bo uporabnik izbrisan"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Če pri naslednjem poskusu vnesete napačen vzorec, bodo delovni profil in podatki v njem izbrisani"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Če pri naslednjem poskusu vnesete napačno kodo PIN, bodo delovni profil in podatki v njem izbrisani"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Če pri naslednjem poskusu vnesete napačno geslo, bodo delovni profil in podatki v njem izbrisani"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Preveč napačnih poskusov. Podatki v napravi bodo izbrisani."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Preveč napačnih poskusov. Uporabnik bo izbrisan."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Preveč napačnih poskusov. Delovni profil in podatki v njem bodo izbrisani."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Opusti"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Geslo mora biti dolgo vsaj toliko znakov: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Koda PIN mora biti vsaj <xliff:g id="COUNT">%d</xliff:g>-mestna"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Naprej"</string>
@@ -648,6 +696,22 @@
     <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>
+    <!-- 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">"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>
@@ -769,7 +833,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Varnostna nastavitev brezžičnega usmerjevalnika (TKIP) ni podprta"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Preverjanje pristnosti ni uspelo. Poskusite znova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Zaznana je druga seja WPS. Poskusite znova čez nekaj minut."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Povezava z omrežjem Wi‑Fi je prekinjena. Nastavitev WPS je preklicana."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Ime omrežja"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Vnesite SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Varnost"</string>
@@ -834,7 +897,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 +933,28 @@
     <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>
+    <!-- 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_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">"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 +1001,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>
@@ -1004,48 +1086,69 @@
     <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>
+    <!-- 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">"Začetni čas"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Končni čas"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Vklopljeno/<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">"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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Privzeto"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Po meri"</string>
-    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Spremenite ozadje"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Spreminjanje ozadja"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Prilagajanje zaslona"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Izberite ozadje iz"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Ohranjevalnik zaslona"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Med polnjenjem ali v stojalu"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Eno ali drugo"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Med polnjenjem"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Ko je v stojalu"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Med napajanjem"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"V stojalu"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Nikoli"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izklopljeno"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Če želite nadzirati, kaj se dogaja, ko je telefon na nosilcu in/ali v stanju pripravljenosti, vklopite ohranjevalnik zaslona."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kdaj naj se zažene"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kdaj zagnati"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Trenutni ohranjevalnik zaslona"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Zaženi zdaj"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začnite zdaj"</string>
     <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>
+    <!-- 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">"Preklop zaslona iz stanja pripravljenosti, ko prejmete obvestila"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Vedno vklopljeno"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Pokaži čas, ikone obvestil in druge informacije"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Pomanjšava ali povečava besedila"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavitve zaklepanja kartice SIM"</string>
@@ -1106,7 +1209,7 @@
     <string name="device_status" msgid="607405385799807324">"Stanje"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Stanje akumulatorja in omrežja ter drugi podatki"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonska številka, signal itn."</string>
-    <string name="storage_settings" msgid="4211799979832404953">"Shramba"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Pomnilnik"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"Shramba"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Nastavitve shrambe"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Izpni pomnilnik USB, prikaži razpoložljiv pomnilnik"</string>
@@ -1299,6 +1402,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>
@@ -1330,6 +1434,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Izbriši kartico SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Izbriši vse podatke v notranjem pomnilniku USB, na primer glasbo ali fotografije."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Izbriši vse podatke na kartici SD, na primer glasbo ali fotografije."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Izbriši kartice e-SIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Brisanje vseh kartic e-SIM v telefonu. S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Brisanje vseh kartic e-SIM v tabličnem računalniku. S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Ponastavi tablični računalnik"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ponastavi telefon"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Želite izbrisati vse osebne podatke in prenesene aplikacije? Tega dejanja ni mogoče razveljaviti."</string>
@@ -1352,26 +1459,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1505,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>
@@ -1519,6 +1620,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1580,6 +1687,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Se izvaja"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Pomnilnik USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na kartici SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Onemogočeno"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ni namešč. za tega uporabnika"</string>
     <string name="installed" msgid="3070865169422600098">"Nameščeno"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ni aplikacij."</string>
@@ -1689,6 +1797,11 @@
     <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>
+    <!-- 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">"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>
@@ -1784,7 +1897,7 @@
     <string name="usage_time_label" msgid="295954901452833058">"Čas uporabe"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Pripomočki za ljudi s posebnimi potrebami"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavitve pripomočkov za ljudi s posebnimi potrebami"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"Bralniki zaslona, prikaz, interakcija"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Kontrolniki za bralnike zaslona, prikaz in interakcije"</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="screen_reader_category_title" msgid="7739154903913400641">"Bralniki zaslona"</string>
@@ -1915,6 +2028,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 +2100,46 @@
     <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>
+    <!-- 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">"Zaslon"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Svetilka"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
@@ -1989,13 +2148,14 @@
     <string name="power_cell" msgid="3392999761958982492">"Mobilno omrežje v stanju pripravljenosti"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni klici"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablični računalnik nedejaven"</string>
-    <string name="power_idle" product="default" msgid="9055659695602194990">"Nedejaven telefon"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon je nedejaven"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Razno"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Preveč šteto"</string>
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,11 +2207,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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> uporablja <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celotne napolnjenosti akumulatorja"</string>
-    <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_detail_since_full_charge" msgid="7515347842046955855">"Razčlenitev od zadnje napol. akumulatorja"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Zadnja polna napolnjenost akumulatorja"</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_detail_foreground" msgid="3350401514602032183">"Med aktivno uporabo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Med izvajanjem v ozadju"</string>
@@ -2706,16 +2868,19 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Privzete aplikacije"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Jeziki, čas, varnostno kopiranje, posodobitve"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavitve"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Preišči nastavitve"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Nastavitve iskanja"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Nastavitve iskanja"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, omrežna povezava"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"sporočilo SMS, pošiljanje sporočil SMS, sporočila SMS, izmenjava sporočil SMS"</string>
@@ -2761,6 +2926,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"poteza"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"plačaj, dotakni se, plačevanje z dotikom, plačila"</string>
     <string name="keywords_backup" msgid="470070289135403022">"varnostna kopija, varnostno kopiranje, varnostno kopirati"</string>
+    <!-- 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">"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>
@@ -2806,7 +2977,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> samodejnih pravil je vklopljenih</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Nastavitve načina »ne moti«"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"»Samo prednostno« dovoljuje"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"»Samo predn.« dovoljuje"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Samodejna pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nastavi pravila za »ne moti«"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Omeji zvoke in vibriranja od določenih urah"</string>
@@ -2837,7 +3008,7 @@
     <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_disable" msgid="859628910427886715">"Sploh ne prikazuj obvestil"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"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>
@@ -2889,8 +3060,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>
@@ -2922,7 +3091,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"Dovoli obvestilno piko"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Pokaži obvestilno piko"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Preglasitev načina »Ne moti«"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Dovoli prikazovanje teh obvestil tudi, ko je način »Ne moti« nastavljen na »Samo prednostno«"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Naj se ta obvestila prikazujejo tudi, ko je način »Ne moti« nastavljen na »Samo prednostno«"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaklenjenem zaslonu"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prednost"</string>
@@ -2937,9 +3106,9 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Ime pravila"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Vnesite ime pravila"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ime pravila je že uporabljeno"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Dodajte več"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Dodaj več"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Izbris pravila"</string>
-    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Izberite vrsto pravila"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Izbira vrste pravila"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Želite izbrisati pravilo »<xliff:g id="RULE">%1$s</xliff:g>«?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Izbris"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Vrsta pravila"</string>
@@ -2976,7 +3145,7 @@
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od kogar koli"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo od stikov"</string>
     <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_from_none" msgid="8219706639954614136">"Brez"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Opomniki"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Dogodki"</string>
@@ -3029,11 +3198,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 +3205,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>
@@ -3064,7 +3228,7 @@
     <string name="storage_type_internal" msgid="6042049833565674948">"Notranja shramba"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Zunanja shramba"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Prenos podatkov aplikacije"</string>
-    <string name="data_summary_format" msgid="6213211533341068366">"Preneseno <xliff:g id="SIZE">%1$s</xliff:g> od <xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="data_summary_format" msgid="6213211533341068366">"Porabljeno <xliff:g id="SIZE">%1$s</xliff:g> od <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"Uporabljena shramba"</string>
     <string name="change" msgid="6657848623929839991">"Sprememba"</string>
     <string name="change_storage" msgid="600475265207060436">"Sprememba shrambe"</string>
@@ -3113,7 +3277,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Dodatno"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguriranje aplikacij"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznana aplikacija"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"Dovoljenja za aplikacije"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Dovoljenja za aplik."</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikacije uporabljajo: <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Dot. za prekl. iz stan. pripr."</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Za preklop naprave iz stanja pripravljenosti se dvakrat dotaknite kjer koli na zaslonu"</string>
@@ -3167,6 +3331,14 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3261,8 +3433,9 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Prekrivanje drugih aplikacij"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g> aplikacij, ki lahko prekrivajo druge aplikacije"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije z dovoljenjem"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dovoljene"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nedovoljene"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Nameščanje neznanih aplikacij"</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>
@@ -3274,8 +3447,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Dovoljenje aplikacijam za sprem. sistem. nastavitev"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Dovoli spreminjanje sistemskih nastavitev"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"To dovoljenje aplikaciji dovoljuje spreminjanje sistemskih nastavitev."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Dovoli aplikacije iz tega vira"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dvakratno sukanje za fotoaparat"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Odprite aplikacijo za fotografiranje, tako da dvakrat zasukate zapestje"</string>
@@ -3372,8 +3543,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>
@@ -3397,7 +3567,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>
@@ -3449,7 +3619,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"brez"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Manjka predmet za uvrščanje."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Predmet za uvrščanje ne vsebuje tega ključa."</string>
-    <string name="special_access" msgid="3458780842491881155">"Posebni dostop za aplikacije"</string>
+    <string name="special_access" msgid="3458780842491881155">"Posebni dostop do aplikacije"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikaciji je dovoljen neomejen prenos podatkov</item>
       <item quantity="two"><xliff:g id="COUNT">%d</xliff:g> aplikacijama je dovoljen neomejen prenos podatkov</item>
@@ -3464,7 +3634,6 @@
     <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="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>
@@ -3535,28 +3704,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Samodejno"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ročno"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Sprostitev prostora"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Poteze"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Bližnjice za poteze"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Hitre poteze za upravljanje telefona"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Hitre poteze za upravljanje tabličnega računalnika"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Hitre poteze za upravljanje naprave"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Preklop na fotoaparat"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Če želite hitro odpreti fotoaparat, dvakrat pritisnite gumb za vklop. Deluje na vsakem zaslonu."</string>
+    <!-- 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">"Obrat fotoaparata"</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">"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_pickup_title" product="default" msgid="818688002837687268">"Preverjanje telefona z dvigom"</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">"Primite telefon, da ga preverite"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Primite tablični računalnik, da ga preverite"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Primite napravo, da jo preverite"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Če želite hitro preveriti obvestila, 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>
+    <!-- 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">"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>
+    <!-- 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">"Odpiranje fotoaparata z dvigom"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Fotoaparat se odpre samodejno, ko telefon dvignete in nastavite v položaj za fotografiranje (pokončno ali ležeče). Telefon je lahko v stanju pripravljenosti ali zaklenjen."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Fotografiranje, ko je tel. v stanju priprav. ali zaklenjen"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Poteza za pomoč"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Občutljivost"</string>
@@ -3674,6 +3870,7 @@
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ali želite odstraniti to nenamestljivo aplikacijo?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Zvočne datoteke"</string>
+    <string name="app_info_storage_title" msgid="5554719444625611987">"Uporabljen prostor"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(odstranjeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogočeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Storitev samodejnega izpolnjevanja"</string>
@@ -3687,5 +3884,10 @@
     <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>
+    <!-- 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-sq/arrays.xml b/res/values-sq/arrays.xml
index 2340b34..7324054 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"I mirë"</item>
     <item msgid="8986346415847956850">"I shkëlqyer"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Gjithmonë!"</item>
-    <item msgid="844721238536786870">"Vetëm kur është i futur në prizë"</item>
-    <item msgid="1986753720941888596">"Asnjëherë!"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Gjithmonë"</item>
-    <item msgid="7433294150916905997">"Vetëm kur është në prizë"</item>
-    <item msgid="1390404486722375028">"Asnjëherë!"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 ditët e fundit"</item>
     <item msgid="6600989128423965319">"Cakto ciklin e përdorimit..."</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 46618db..44dc972 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Refuzo"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Mbyll"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Ndërro"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"E panjohur"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Tani je <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> hapa larg të qenët programues.</item>
       <item quantity="one">Tani je <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> hap larg të qenët programues.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Nuk ke leje për të ndryshuar cilësimet e \"Bluetooth-it\"."</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> është e dukshme për pajisjet në afërsi kur Cilësimet e Bluetooth-it janë të hapura."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Pajisjet e tua"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Llogaritë"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vendndodhja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Llogaritë"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Siguria dhe vendndodhja"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptimi dhe kredencialet"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefoni është i enkriptuar"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Pajisja është e enkriptuar"</string>
@@ -354,40 +378,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +488,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 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Ndrysho motivin e shkyçjes"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ndrysho kodin PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ndrysho fjalk. shkyçjes"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Provo sërish. Përpjekja <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> nga <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Përpjekja e fundit"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Nëse fut motivin e punës gabimisht gjatë kësaj përpjekjeje, profili i punës dhe të dhënat shoqëruese do të hiqeni nga kjo pajisje."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Nëse fut numrin PIN të punës gabimisht gjatë kësaj përpjekjeje, profili i punës dhe të dhënat shoqëruese do të hiqeni nga kjo pajisje."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Nëse fut fjalëkalimin e punës gabimisht gjatë kësaj përpjekjeje, profili i punës dhe të dhënat shoqëruese do të hiqeni nga kjo pajisje."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Shumë përpjekje të pasakta. Profili i punës dhe të dhënat shoqëruese do të hiqeni nga kjo pajisje."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Largoje"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Provo sërish. Tentativa <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> nga <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Të dhënat e tua do të fshihen"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Nëse fut një motiv të pasaktë në tentativën tjetër, të dhënat e kësaj pajisjeje do të fshihen"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Nëse fut një kod PIN të pasaktë në tentativën tjetër, të dhënat e kësaj pajisjeje do të fshihen"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Nëse fut një fjalëkalim të pasaktë në tentativën tjetër, të dhënat e kësaj pajisjeje do të fshihen"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Nëse fut një motiv të pasaktë në tentativën tjetër, ky përdorues do të fshihet"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Nëse fut një kod PIN të pasaktë në tentativën tjetër, ky përdorues do të fshihet"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Nëse fut një fjalëkalim të pasaktë në tentativën tjetër, ky përdorues do të fshihet"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Nëse fut një motiv të pasaktë në tentativën tjetër, profili yt i punës dhe të dhënat e tij do të fshihen"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Nëse fut një kod PIN të pasaktë në tentativën tjetër, profili yt i punës dhe të dhënat e tij do të fshihen"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Nëse fut një fjalëkalim të pasaktë në tentativën tjetër, profili yt i punës dhe të dhënat e tij do të fshihen"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Shumë tentativa të pasakta. Të dhënat e kësaj pajisjeje do të fshihen."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Shumë tentativa të pasakta. Ky përdorues do të fshihet."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Shumë tentativa të pasakta. Ky profil pune dhe të dhënat e tij do të fshihen."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Hiqe"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Duhet të jetë të paktën <xliff:g id="COUNT">%d</xliff:g> karaktere"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Kodi PIN duhet të jetë të paktën <xliff:g id="COUNT">%d</xliff:g> shifra"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Vazhdo"</string>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +812,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Cilësimi i sigurisë së rrugëzuesit pa tel (TKIP) nuk mbështetet"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Verifikimi dështoi, provo përsëri."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"U zbulua një sesion tjetër i WPS-së. Provo përsëri për disa minuta."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi u shkëput. Konfigurimi i WPS u anulua."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Emri i rrjetit"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Fut SSID-në"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Siguria"</string>
@@ -810,7 +874,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 +910,28 @@
     <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>
+    <!-- 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_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">"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 +978,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>
@@ -980,23 +1063,33 @@
     <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>
+    <!-- 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">"Koha e nisjes"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Koha e përfundimit"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Ndezur / <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">"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 +1113,19 @@
     <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>
+    <!-- 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">"Zgjoje ekranin kur të merren njoftime"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Gjithmonë aktiv"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Shfaq orën, ikonat e njoftimeve dhe informacione të tjera"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Madhësa e shkrimit"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Bëje tekstin më të madh ose më të vogël"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Kyçja e kartës SIM"</string>
@@ -1273,6 +1377,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>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Spastroje kartën SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Spastro të gjitha të dhënat në hapësirën ruajtëse të brendshme të USB-së, si muzikën ose fotografitë"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Spastro të gjitha të dhënat në kartën SD, si muzikën ose fotografitë"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Spastro eSIM-et"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Spastro të gjitha kartat eSIM në telefon. Kjo nuk do të anulojë planin tënd të shërbimit celular."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Spastro të gjitha kartat eSIM në tablet. Kjo nuk do të anulojë planin tënd të shërbimit celular."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Rivendos tabletin"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Rivendose telefonin"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Të spastrohen të gjitha informacionet e tua personale dhe aplikacionet e shkarkuara? Ky veprim nuk mund të kthehet mbrapsht!"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,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>
@@ -1491,6 +1593,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1658,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Vrapim"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Hapësira ruajtëse e USB-së"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Në kartën SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Çaktivizuar"</string>
     <string name="not_installed" msgid="2797554494953450291">"Nuk është i instaluar për këtë përdorues"</string>
     <string name="installed" msgid="3070865169422600098">"I instaluar"</string>
     <string name="no_applications" msgid="7336588977497084921">"Asnjë aplikacion."</string>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
+    <!-- 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">"Ekrani"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Blici"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2111,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2164,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2815,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplikacionet e parazgjedhura"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Gjuhët, koha, rezervimi, përditësimet"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Cilësimet"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Kërko \"Cilësimet\""</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Kërko \"Cilësimet\""</string>
+    <string name="search_menu" msgid="6283419262313758339">"Cilësimet e kërkimit"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Cilësimet e kërkimit"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, lidhje rrjeti"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mesazhe me tekst, dërgimi i mesazheve, mesazhe, mesazhim"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, celular, operator celular, pa tel, të dhëna, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2873,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gjesti"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"paguaj, trokit, pagesa"</string>
     <string name="keywords_backup" msgid="470070289135403022">"rezervim, rezervo"</string>
+    <!-- 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">"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>
@@ -2832,9 +3002,7 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"fbf figurë brenda"</string>
     <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="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="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>
@@ -2965,11 +3133,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 +3140,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 +3258,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,8 +3356,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Instalo aplikacione të panjohura"</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>
@@ -3200,8 +3370,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Leje për aplikacionin që të modifikojë cilësimet e sistemit"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Lejo modifikimin e cilësimeve të sistemit"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Kjo leje e lejon një aplikacion të modifikojë cilësimet e sistemit."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Po"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Jo"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Lejo nga ky burim"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Rrotullo dy herë për kamerën"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Hap aplikacionin e kamerës duke rrotulluar kyçin e dorës dy herë"</string>
@@ -3296,8 +3464,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 +3484,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>
@@ -3382,7 +3549,6 @@
     <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="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>
@@ -3447,28 +3613,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatike"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liro hapësirën tani"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Gjestet"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Shkurtoret e gjesteve"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gjeste të shpejta për të kontrolluar telefonin"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gjestet e shpejta për të kontrolluar tabletin"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gjestet e shpejta për të kontrolluar pajisjen"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kalo te kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Për të hapur me shpejtësi kamerën, shtyp dy herë te butoni i energjisë. Funksionon nga çdo ekran."</string>
+    <!-- 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">"Rrotulloje kamerën"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Ngrije për të hapur kamerën"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Për të hapur kamerën automatikisht, ngrije telefonin në një pozicion për shkrepjen e fotografive (vertikalisht ose horizontalisht). Funksionon kur telefoni është në fjetje ose i kyçur."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Shkrep fotografi kur telefoni është në fjetje ose i kyçur"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gjesti ndihmës"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Ndjeshmëria"</string>
@@ -3572,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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-sr/arrays.xml b/res/values-sr/arrays.xml
index 6212910..3085397 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добра"</item>
     <item msgid="8986346415847956850">"Одлична"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Увек"</item>
-    <item msgid="844721238536786870">"Само кад се пуни"</item>
-    <item msgid="1986753720941888596">"Никад"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Увек"</item>
-    <item msgid="7433294150916905997">"Само кад се пуни"</item>
-    <item msgid="1390404486722375028">"Никада"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Последњих 30 дана"</item>
     <item msgid="6600989128423965319">"Подеси циклус потрошње..."</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 654fd2e..9543f31 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/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>
@@ -31,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>
@@ -42,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>
@@ -107,10 +108,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">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> је видљив уређајима у близини док су Bluetooth подешавања отворена."</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>
@@ -122,7 +139,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">"Додирните да бисте упарили са уређајем <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>
@@ -158,6 +176,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) -->
@@ -331,7 +354,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Налози"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Налози"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Безбедност и локација"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Безбедност и локација"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифровање и акредитиви"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон је шифрован"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Уређај је шифрован"</string>
@@ -357,40 +380,55 @@
     <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>
@@ -452,6 +490,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 +562,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Промена шаблона за откључавање"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промена PIN-а за откључавање"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промена лозинке за откључавање"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Пробајте поново. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. покушај од <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Последњи покушај"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ако у овом покушају унесете нетачан шаблон за Work, са овог уређаја ћемо уклонити профил за Work и повезане податке."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ако у овом покушају унесете нетачан PIN за Work, са овог уређаја ћемо уклонити профил за Work и повезане податке."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ако у овом покушају унесете нетачну лозинку за Work, са овог уређаја ћемо уклонити профил за Work и повезане податке."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Превише нетачних покушаја. Уклонићемо профил за Work и повезане податке са овог уређаја."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Одбаци"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Пробајте поново. <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>. покушај од <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Избрисаћемо податке"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ако у следећем покушају унесете нетачан шаблон, избрисаћемо податке са овог уређаја"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ако у следећем покушају унесете нетачан PIN, избрисаћемо податке са овог уређаја"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ако унесете нетачну лозинку при следећем покушају, избрисаћемо податке са овог уређаја"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ако у следећем покушају унесете нетачан шаблон, избрисаћемо овог корисника"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ако у следећем покушају унесете нетачан PIN, избрисаћемо овог корисника"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ако у следећем покушају унесете нетачну лозинку, избрисаћемо овог корисника"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ако у следећем покушају унесете нетачан шаблон, избрисаћемо профил за Work и његове податке"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ако у следећем покушају унесете нетачан PIN, избрисаћемо профил за Work и његове податке"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ако у следећем покушају унесете нетачну лозинку, избрисаћемо профил за Work и његове податке"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Превише нетачних покушаја. Избрисаћемо податке са овог уређаја."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Превише нетачних покушаја. Избрисаћемо овог корисника."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Превише нетачних покушаја. Избрисаћемо овај профил за Work и његове податке."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Одбаци"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Минималан број знакова је <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Минималан број цифара за PIN је <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Настави"</string>
@@ -637,6 +685,22 @@
     <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>
+    <!-- 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>
@@ -758,7 +822,6 @@
     <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_ssid" msgid="5519636102673067319">"Име мреже"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Унесите SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безбедност"</string>
@@ -822,7 +885,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 +921,28 @@
     <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>
+    <!-- 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_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">"Укључивање хотспота…"</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 +989,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>
@@ -973,7 +1055,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>
@@ -992,23 +1074,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1019,21 +1111,32 @@
     <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_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="doze_summary" msgid="3846219936142814032">"Пробуди екран када примим обавештења"</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>
@@ -1286,6 +1389,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>
@@ -1316,6 +1420,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Избриши SD картицу"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Обриши све податке из интерне USB меморије, као што су музика и фотографије."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Избриши све податке са SD картице, као што су музика или фотографије"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Обришите eSIM-ове"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Обришите све eSIM-ове на телефону. На тај начин нећете отказати мобилни тарифни пакет."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Обришите све eSIM-ове на таблету. На тај начин нећете отказати мобилни тарифни пакет."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Враћање таблета на подразумеване вредности"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Ресетуј телефон"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Желите ли да обришете све личне податке и преузете апликације? Не можете да опозовете ову радњу!"</string>
@@ -1338,26 +1445,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1491,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>
@@ -1505,6 +1606,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1565,6 +1672,7 @@
     <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="default" msgid="1477351142334784771">"На SD картици"</string>
+    <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>
@@ -1674,6 +1782,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Помоћ за унос"</string>
@@ -1894,6 +2007,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>
@@ -1960,6 +2078,46 @@
     <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>
@@ -1974,7 +2132,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>
@@ -2026,6 +2185,8 @@
     <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>
+    <!-- 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>
@@ -2053,7 +2214,7 @@
     <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>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Приказује проценат напуњености батерије на статусној траци"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Статистика процеса"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Штреберска статистика о активним процесима"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Искоришћеност меморије"</string>
@@ -2680,9 +2841,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>
@@ -2690,7 +2854,7 @@
     <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="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">"SMS, слање SMS-ова, поруке, слање порука"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"мобилна мрежа, мобилни подаци, мобилни оператер, бежично, подаци, 4g, 3g, 2g, lte"</string>
@@ -2735,6 +2899,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>
@@ -2757,7 +2927,7 @@
     <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>
@@ -2778,7 +2948,7 @@
       <item quantity="few"><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_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>
@@ -2861,8 +3031,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>
@@ -2946,7 +3114,7 @@
     <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>
@@ -2997,11 +3165,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>
@@ -3009,7 +3172,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Можете додатно да заштитите уређај тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке или обавештења, укључујући аларме. \n\nТо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите захтев за PIN при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати шаблон при покретању уређаја?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи лозинке пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Тражити PIN?"</string>
@@ -3129,8 +3292,15 @@
     <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="few"><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>
@@ -3224,8 +3394,9 @@
     <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="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>
@@ -3237,8 +3408,6 @@
     <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_switch_title" msgid="3621381992793251070">"Дозволи из овог извора"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Двапут заокрените за камеру"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Отворите апликацију Камера тако што ћете двапут заокренути ручни зглоб"</string>
@@ -3334,8 +3503,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 +3525,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>
@@ -3423,7 +3591,6 @@
     <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_warning" msgid="9086859595338944882">"Премијум SMS-ови могу да коштају и повећаће рачуне код мобилног оператера. Ако омогућите дозволу за неку апликацију, моћи ћете да шаљете премијум SMS-ове помоћу те апликације."</string>
@@ -3491,28 +3658,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3623,6 +3817,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 +3831,10 @@
     <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>
+    <!-- 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-sv/arrays.xml b/res/values-sv/arrays.xml
index 26e17f8..7f3847c 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Bra"</item>
     <item msgid="8986346415847956850">"Utmärkt"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Alltid"</item>
-    <item msgid="844721238536786870">"Endast när den är inkopplad"</item>
-    <item msgid="1986753720941888596">"Aldrig"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Alltid"</item>
-    <item msgid="7433294150916905997">"Endast när den är inkopplad"</item>
-    <item msgid="1390404486722375028">"Aldrig"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Senaste 30 dagarna"</item>
     <item msgid="6600989128423965319">"Ange användningscykel ..."</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8b7a6ce..e3ada9c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Neka"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Stäng"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Byt"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Du är nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steg från att bli utvecklare.</item>
       <item quantity="one">Du är nu <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> steg från att bli utvecklare.</item>
     </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 +41,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>
@@ -72,8 +73,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">"Avmontera USB-enhet"</string>
-    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Avmontera SD-kort"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Demontera USB-enhet"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Montera bort SD-kort"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Radera USB-lagring"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Radera SD-kort"</string>
     <string name="preview_pager_content_description" msgid="8926235999291761243">"Förhandsgranskning"</string>
@@ -106,10 +107,26 @@
     <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>
+    <!-- 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">"Du saknar behörighet att ändra Bluetooth-inställningarna."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"Vill du koppla från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Bluetooth-sändning"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Vill du inaktivera profilen?"</string>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dina enheter"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,8 @@
     <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"Hindra andra från att använda enheten utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"Hindra andra från att använda mobilen utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Välj en reservmetod för skärmlås"</string>
+    <string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Alternativ för skärmlås"</string>
+    <string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Alternativ för skärmlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skärmlås"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/omedelbart efter viloläge"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> efter viloläge"</string>
@@ -519,13 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Byt grafiskt lösenord"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ändra PIN-kod för upplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ändra lösenord för upplåsning"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Försök igen. Försök <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> av <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Sista försöket"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Om du anger fel grafiskt lösenord under det här försöket kommer jobbprofilen och den data som har kopplats till profilen att tas bort från enheten."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Om du anger fel pinkod under det här försöket kommer jobbprofilen och den data som har kopplats till profilen att tas bort från enheten."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Om du anger fel lösenord under det här försöket kommer jobbprofilen och den data som har kopplats till profilen att tas bort från enheten."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"För många felaktiga försök. Jobbprofilen och data som har kopplats till den tas bort från enheten."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ignorera"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Försök igen. Försök <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> av <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Din data raderas."</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Enhetens data raderas om du anger fel grafiskt lösenord vid nästa försök"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Enhetens data raderas om du anger fel pinkod vid nästa försök"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Enhetens data raderas om du anger fel lösenord vid nästa försök"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Användaren raderas om du anger fel grafiskt lösenord vid nästa försök"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Användaren raderas om du anger fel pinkod vid nästa försök"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Den här användaren raderas om du anger fel lösenord vid nästa försök"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Jobbprofilen och dess data raders om du anger fel grafiskt lösenord vid nästa försök"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Jobbprofilen och dess data raderas om du anger fel pinkod vid nästa försök"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Din jobbprofil och dess data raderas om du anger fel lösenord vid nästa försök"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"För många felaktiga försök. Enhetens data raderas"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"För många felaktiga försök. Den här användaren raderas."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"För många felaktiga försök. Den här jobbprofilen och dess data raderas."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ignorera"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Lösenordet måste innehålla minst <xliff:g id="COUNT">%d</xliff:g> tecken"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Pinkoden måste innehålla minst <xliff:g id="COUNT">%d</xliff:g> siffror"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsätt"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Säkerhetsinställningen för den trådlösa routern (TKIP) stöds inte"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfel. Försök igen."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annan WPS-session upptäcktes. Försök igen om några minuter."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi har kopplats från. WPS-konfigurationen har avbrutits."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Nätverksnamn"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Ange SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Säkerhet"</string>
@@ -810,7 +873,6 @@
       <item quantity="one">1 nätverk</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avancerat för Wi-Fi"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurera Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Mac-adress"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adress"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Nätmask"</string>
@@ -847,17 +909,36 @@
     <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_tether_starting" msgid="1322237938998639724">"Aktiverar surfzon ..."</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Surfzon inaktiveras ..."</string>
+    <!-- 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_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">"Aktiverar trådlös surfzon ..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Trådlös surfzon inaktiveras ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> är aktiv"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Fel på mobil Wi-Fi-surfzon"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurera surfzon via Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurera trådlös surfzon via Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Installation för Wi-Fi-surfzon"</string>
-    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK-surfzon"</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> surfzon"</string>
+    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Trådlös AndroidAP WPA2 PSK-surfzon"</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> trådlös surfzon"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-samtal"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Aktivera samtal via Wi-Fi"</string>
@@ -896,6 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Starttid"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Sluttid"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"På/<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">"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>
@@ -1007,21 +1099,32 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Anpassa skärmen"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Välj bakgrund från"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Skärmsläckare"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Vid laddning eller dockning"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"När enheten laddas eller dockas"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Båda"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Vid laddning"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Vid dockning"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Telefonen laddar"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Enheten dockas"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Aldrig"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Om du vill styra vad som händer när mobilen är dockad eller i viloläge aktiverar du skärmsläckaren."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Startas"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Vid start"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Aktuell skärmsläckare"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Starta nu"</string>
     <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>
+    <!-- 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">"Aktivera skärmen när du får aviseringar"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Alltid på"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Visa tid, aviseringsikoner och annan information"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gör texten större eller mindre."</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
@@ -1083,8 +1186,8 @@
     <string name="storage_settings" msgid="4211799979832404953">"Lagring"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"Lagring"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Lagringsinställningar"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Avmontera USB-lagringsenheten och visa tillgängligt lagringsutrymme"</string>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Avmontera SD-kort, visa tillgängligt lagringsutrymme"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Demontera USB-lagringsenheten och visa tillgängligt lagringsutrymme"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Montera bort SD-kort, visa tillgängligt lagringsutrymme"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"Mobilnummer (MDN)"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mitt telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -1119,10 +1222,10 @@
     <string name="memory_music_usage" msgid="1363785144783011606">"Ljud (musik, ringsignaler, poddsändningar m.m.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"Andra filer"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cachelagrade data"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Avmontera enhet"</string>
-    <string name="sd_eject" product="default" msgid="6915293408836853020">"Avmontera SD-kort"</string>
-    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Avmontera intern USB-lagring"</string>
-    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Avmontera SD-kortet för säker borttagning"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Montera bort enhet"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Montera bort SD-kort"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontera intern USB-lagring"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Demontera SD-kortet för säker borttagning"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Sätt i USB om du vill montera"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Sätt in ett SD-kort för montering"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Sätt i USB-enheten"</string>
@@ -1142,12 +1245,12 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Om du tar bort SD-kortet avbryts några av de appar som körs och de kanske inte blir tillgängliga igen förrän du sätter tillbaka SD-kortet."</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">"Det går inte att avmontera USB-lagringsenheten. Försök igen senare."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"Det går inte att avmontera SD-kortet. Försök senare."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"Det går inte att ta bort USB-lagringsenheten. Försök igen senare."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"Det går inte att ta bort SD-kortet. Försök senare."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-lagringsenheten demonteras."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Delad lagringsenhet monteras bort."</string>
-    <string name="sd_ejecting_title" msgid="8824572198034365468">"Avmonterar"</string>
-    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Avmonterar"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Monterar bort"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Monterar bort"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Lagringsutrymmet börjar ta slut"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Vissa systemfunktioner, t.ex. synkronisering, fungerar kanske inte som de ska. Försök att frigöra utrymme genom att ta bort eller lossa objekt, till exempel appar eller medieinnehåll."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"Byt namn"</string>
@@ -1273,18 +1376,19 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Återställ"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Återställ nätverksinställningar"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Nätverksinställningarna återställda"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Alla nätverksinställningar återställs, till exempel \n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Återställ inställningar"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Vill du återställa alla nätverksinställningar? Det går inte att ångra den här åtgärden."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Återställ inställningar"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vill du återställa?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Den här användaren kan inte återställa nätverket"</string>
-    <string name="reset_network_complete_toast" msgid="787829973559541880">"Nätverksinställningarna har återställts"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Nätverksinställningarna har inte återställts"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
       <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konton återställs</item>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Radera SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Radera alla data på den interna USB-lagringsenheten, som musik och foton."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Radera all data på SD-kortet, som musik och foton."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Rensa eSIM-kort"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Rensa alla eSIM-kort på mobilen. Detta innebär inte att serviceavtalet avslutas."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Rensa alla eSIM-kort på surfplattan. Detta innebär inte att serviceavtalet avslutas."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Återställ surfplattan"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Återställ telefonen"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Vill du radera alla personliga uppgifter och alla nedladdade appar? Det går inte att ångra den här åtgärden."</string>
@@ -1317,33 +1424,27 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobil surfpunkt"</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>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Surfzon har aktiverats, internetdelning"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Surfzon har aktiverats"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Trådlös surfzon och internetdelning"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Trådlös surfzon har aktiverats, internetdelning"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Trådlös surfzon har aktiverats"</string>
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Kör"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
+    <string name="disabled" msgid="9206776641295849915">"Inaktiverad"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ej installerad för användaren"</string>
     <string name="installed" msgid="3070865169422600098">"Installerad"</string>
     <string name="no_applications" msgid="7336588977497084921">"Inga appar."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Skärm"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Ficklampa"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2814,20 @@
       <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">"trådlös surfzon"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Anslutna enheter"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, casta, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"Bluetooth, casta"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Appar och aviseringar"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Behörigheter, standardappar"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Användare och konton"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Standardappar"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Språk, säkerhetskopiering, uppdateringar"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Inställningar"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Sök i inställningar"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Sök i inställningar"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Sökinställningar"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Sökinställningar"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, nätverksanslutning"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"textmeddelande, sms:a, meddelanden, skicka sms"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiltelefon, mobil, mobiloperatör, trådlös, data, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"rörelse"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betala, tryck, betalningar"</string>
     <string name="keywords_backup" msgid="470070289135403022">"säkerhetskopia, säkerhets kopia"</string>
+    <!-- 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">"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>
@@ -2726,7 +2895,7 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolym"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ringvolym"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Aviseringsvolym"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Ringsignal"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Standardljud för aviseringar"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Ljud från appen"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"Standardljud för aviseringar"</string>
@@ -2833,8 +3002,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>
@@ -2965,11 +3132,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 +3139,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>
@@ -2991,7 +3153,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Relativ information om IMEI-kod"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Plats <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Öppna som standard"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Öppnar länkar"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Länköppning"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Öppna länkar som stöds"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Öppna utan att fråga"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Länkar som stöds"</string>
@@ -3047,7 +3209,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Appar som använder <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Väck genom att trycka"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Väck enheten genom att trycka två gånger var som helst på skärmen"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Öppna länkar"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Länköppning"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Öppna inte länkar som stöds"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Öppna <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Öppna <xliff:g id="DOMAIN">%s</xliff:g> och andra webbadresser"</string>
@@ -3071,7 +3233,7 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"Välj röstinmatning"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Webbläsarapp"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Ingen standardwebbläsare"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Telefonapp"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Appen Telefon"</string>
     <string name="default_app" msgid="6864503001385843060">"(Standard)"</string>
     <string name="system_app" msgid="9068313769550747372">"(System)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Systemstandard)"</string>
@@ -3095,6 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Installera okända appar"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Behörighet för app att ändra systeminställningar"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Tillåt att appen ändrar systeminställningar"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Med den här behörigheten kan appen ändra systeminställningarna."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Tillåt från den här källan"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Två handledsvridningar öppnar kameran"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Öppna kameran med två handledsvridningar"</string>
@@ -3296,8 +3463,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>
@@ -3317,7 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiskt"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuellt"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Frigör utrymme nu"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Rörelser"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Kortkommandon för rörelse"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Styr mobilen med snabba rörelser"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Styr surfplattan med snabba rörelser"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Styr enheten med snabba rörelser"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Hoppa till kameran"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Tryck två gånger på strömbrytaren för att snabbt öppna kameran. Du kan göra det på alla skärmar."</string>
+    <!-- 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">"Vänd kameran"</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">"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>
+    <!-- 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">"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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Svep med fingret för aviseringar"</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">"Visa aviseringar genom att svepa med fingret"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av mobilen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av surfplattan."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av enheten."</string>
+    <!-- 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">"Höj mobilen för att öppna kameran"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Öppna kameran automatiskt genom att lyfta mobilen som om du skulle ta ett foto (liggande eller stående). Fungerar när mobilen är i viloläge eller låst."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Ta foton när mobilen är i viloläge eller låst"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistentrörelse"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Känslighet"</string>
@@ -3572,6 +3764,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>
@@ -3585,5 +3778,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Snabbapp"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Vill du inaktivera lagringshanteraren?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Fil- och TV-appar"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Använt lagringsutrymme"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Information om operatörsadministration"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivera operatörsadministration"</string>
+    <!-- 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-sw/arrays.xml b/res/values-sw/arrays.xml
index a0f61d6..3a04de1 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Thabiti"</item>
     <item msgid="8986346415847956850">"Bora zaidi"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Daima"</item>
-    <item msgid="844721238536786870">"Wakati inachaji pekee"</item>
-    <item msgid="1986753720941888596">"Katu"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Daima"</item>
-    <item msgid="7433294150916905997">"Wakati inachaji pekee"</item>
-    <item msgid="1390404486722375028">"kamwe"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Siku 30 zilizopita"</item>
     <item msgid="6600989128423965319">"Weka mzunguko wa matumizi..."</item>
@@ -242,7 +232,7 @@
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"Eneo"</item>
     <item msgid="255608127647030286">"Binafsi"</item>
-    <item msgid="4588829735729884491">"Kutuma ujumbe"</item>
+    <item msgid="4588829735729884491">"Utumaji ujumbe"</item>
     <item msgid="886742181977884584">"Vyombo vya Habari"</item>
     <item msgid="7924928667052300589">"Kifaa"</item>
   </string-array>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7a74661..ea2c99f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Kana"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Funga"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Swichi"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Haijulikani"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Umebakisha hatua <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ili uwe msanidi programu.</item>
       <item quantity="one">Umebakisha hatua <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ili uwe msanidi programu.</item>
     </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 +41,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE Inayotumika"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Inaruhusu Hangout ya Video"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Inaruhusu Kupiga Simu kupitia Wi-Fi"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Inaruhusu EAB"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Nishati ya Redio ya Simu"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Angalia Kitabu cha Anwani katika SIM"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ona nambari za simu zilizobainishwa"</string>
@@ -106,10 +107,26 @@
     <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>
+    <!-- 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">"Huna ruhusa ya kubadilisha mipangilio ya Bluetooth."</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> inaonekana kwenye vifaa vya karibu wakati mipangilio ya Bluetooth imewashwa."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vifaa vyako"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Tarehe na saa"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chagua saa za eneo"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akaunti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kutambua Eneo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akaunti"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Mahali na Usalama"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Mahali na; usalama"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Vitambulisho na usimbaji fiche"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Simu imesimbwa kwa njia fiche"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Kifaa kimesimbwa kwa njia fiche"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Badilisha umbo la kufungua"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Badilisha PIN ya kufungua"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Badilisha nenosiri la kufungua"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Jaribu tena. Inajaribu mara ya <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kati ya <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Jaribio la mwisho"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Ukiweka mchoro wa kazini usiofaa mara hii, wasifu wako wa kazini na data inayohusiana nao itaondolewa kwenye kifaa hiki."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Ukiweka PIN ya kazini isiyo sahihi mara hii, wasifu wako wa kazini na data inayohusiana nao itaondolewa kwenye kifaa hiki."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Ukiweka nenosiri la kazini lisilo sahihi mara hii, wasifu wako wa kazini na data inayohusiana nao itaondolewa kwenye kifaa hiki."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Umejaribu mara nyingi mno bila kufaulu. Wasifu wako wa kazini na data inayohusiana nao itaondolewa kwenye kifaa hiki."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Ondoa"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Jaribu tena. Jaribio la <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kati ya <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> zinazoruhusiwa."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Data yako itafutwa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Ukiweka mchoro usio sahihi utakapojaribu tena, data iliyo kwenye kifaa hiki itafutwa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Ukiweka PIN isiyo sahihi utakapojaribu tena, data iliyo kwenye kifaa hiki itafutwa"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Ukiweka nenosiri lisilo sahihi utakapojaribu tena, data iliyo kwenye kifaa hiki itafutwa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Ukiweka mchoro usio sahihi utakapojaribu tena, maelezo ya mtumiaji huyu yatafutwa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Ukiweka PIN isiyo sahihi utakapojaribu tena, maelezo ya mtumiaji huyu yatafutwa"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Ukiweka nenosiri lisilo sahihi utakapojaribu tena, maelezo ya mtumiaji huyu yatafutwa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Ukiweka mchoro usio sahihi utakapojaribu tena, wasifu wako wa kazini utafutwa pamoja na data yake"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Ukiweka PIN isiyo sahihi utakapojaribu tena, wasifu wako wa kazini utafutwa pamoja na data yake"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Ukiweka nenosiri lisilo sahihi utakapojaribu tena, wasifu wako wa kazini utafutwa pamoja na data yake"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Umejaribu kufungua mara nyingi mno kwa njia isiyo sahihi. Data iliyo kwenye kifaa hiki itafutwa."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Umejaribu kufungua mara nyingi mno kwa njia isiyo sahihi. Maelezo ya mtumiaji huyu yatafutwa."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Umejaribu kufungua mara nyingi mno kwa njia isiyo sahihi. Wasifu huu wa kazini utafutwa pamoja na data yake."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Ondoa"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Ni lazima liwe na angalau herufi <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Ni lazima PIN iwe na angalau tarakimu <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Endelea"</string>
@@ -626,6 +674,22 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth mahiri"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth ikiwa imewashwa, kifaa chako kinaweza kuwasiliana na vifaa vingine vyenye Bluetooth vilivyo karibu."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma za mfumo bado zinaweza kutambua vifaa vyenye Bluetooth. Unaweza kubadilisha hali hii katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya kutafuta<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Mpangilio wa usalama wa kisambaza data kisichotumia waya (TKIP) hauwezi kutumika."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Imeshindwa kuthibitisha. Tafadhali jaribu tena."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Kipindi kingine cha WPS kimegunduliwa. Tafadhali jaribu tena baada ya dakika chache."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Muunganisho wa Wi‑Fi umekatika. Imeghairi shughuli ya kuweka mipangilio ya WPS."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Jina la mtandao"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Weka Kitambulisho cha Mtandao (SSID)"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Usalama"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -950,7 +1032,7 @@
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Akaunti ya binafsi- <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="1910951467596035063">"Tafuta"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Simamia mipangilio ya utafutaji na historia"</string>
-    <string name="search_settings_no_results" msgid="8799027492641230999">"Hakuna matokeo yoyote yaliyopatikana"</string>
+    <string name="search_settings_no_results" msgid="8799027492641230999">"Haikupata matokeo"</string>
     <string name="display_settings" msgid="7965901687241669598">"Kwenye Skrini"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Skrini ijizungushe kiotomatiki"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</string>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Litawashwa"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Litazimwa"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Limewashwa / <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">"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>
@@ -1007,21 +1099,32 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Weka mapendeleo ya skrini yako"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chagua mandhari kutoka"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Taswira ya skrini"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Inapochaji au wakati imeambatishwa"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Inapochaji au ikiwa imeambatishwa"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Yoyote kati ya hizi mbili"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Inapochaji"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Wakati imeambatishwa"</string>
-    <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Isiwahi"</string>
+    <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Haijawahi"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Imezimwa"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Ili udhibiti kinachotendeka wakati simu imeambatishwa na/au iko katika hali tuli, washa taswira ya skrini."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Ianze lini?"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Wakati wa kuanza"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Taswira ya skrini ya sasa"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Anza sasa"</string>
     <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>
+    <!-- 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">"Washa skrini arifa zinapoingia"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Imewashwa kila wakati"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Onyesha saa, aikoni za arifa na maelezo mengine"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa fonti"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Kuongeza au kupunguza ukubwa wa maandishi"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mipangilio ya kuzima SIM"</string>
@@ -1269,10 +1372,11 @@
     <string name="menu_save" msgid="8109345640668285399">"Hifadhi"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"Tupa"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
-    <string name="error_name_empty" msgid="5508155943840201232">"Huwezi kuacha sehemu hii ikiwa haijajazwa."</string>
+    <string name="error_name_empty" msgid="5508155943840201232">"Sehemu hii haiwezi kuachwa ikiwa haijajazwa."</string>
     <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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Futa kadi ya SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Futa data zote kwenye hifadhi ya ndani ya USB, kama vile muziki au picha"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Futa data zote kwenye kadi ya SD, kama vile muziki au picha."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Futa eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Futa eSIM zote kwenye simu. Kufanya hivi hakutaghairi mpango wako wa huduma ya simu ya mkononi."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Futa eSIM zote kwenye kompyuta kibao. Kufanya hivi hakutaghairi mpango wako wa huduma za kifaa cha mkononi."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Rejesha mipangilio ambayo kompyuta kibao ilitoka nayo kiwandani"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Rejesha mipangilio ya mwanzoni ya simu"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Ungependa kufuta maelezo yako yote ya kibinafsi na programu zilizopakuliwa? Huwezi kutendua hatua hii!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1376,7 +1477,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>
@@ -1491,16 +1592,22 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Wezesha chaguo zaidi ya mipangilio."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Maelezo ya programu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Hifadhi"</string>
-    <string name="auto_launch_label" msgid="2669236885531442195">"Fungua moja kwa moja"</string>
+    <string name="auto_launch_label" msgid="2669236885531442195">"Fungua kwa chaguo-msingi"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Chaguo-msingi"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Utangamanifu wa skrini"</string>
-    <string name="permissions_label" msgid="2605296874922726203">"Ruhusa"</string>
+    <string name="permissions_label" msgid="2605296874922726203">"Idhini"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Akiba"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Futa akiba"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Akiba"</string>
@@ -1510,7 +1617,7 @@
     </plurals>
     <string name="clear_uri_btn_text" msgid="8575655132961012158">"Futa ufikiaji"</string>
     <string name="controls_label" msgid="7611113077086853799">"Vidhibiti"</string>
-    <string name="force_stop" msgid="7435006169872876756">"Ilazimishe ikome"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Komesha kwa lazima"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Jumla"</string>
     <string name="application_size_label" msgid="7376689739076506885">"Ukubwa wa programu"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Programu ya hifadhi ya USB"</string>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Zinazotumika"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Hifadhi ya USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Kwenye kadi ya SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Imezimwa"</string>
     <string name="not_installed" msgid="2797554494953450291">"Haijasanidiwa kwa mtumiaji huyu"</string>
     <string name="installed" msgid="3070865169422600098">"Imesakinishwa"</string>
     <string name="no_applications" msgid="7336588977497084921">"Hakuna programu yoyote."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"Skrini"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Tochi"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -1975,7 +2133,7 @@
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Uwezo jumla wa betri"</string>
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Matumizi ya nishati yaliyokokotolewa"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Matumizi ya nishati yaliyoonekana"</string>
-    <string name="battery_action_stop" msgid="649958863744041872">"Ilazimishe ikome"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Komesha kwa lazima"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Taarifa ya programu"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Mipangilio ya App"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Mipangilio"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2320,7 +2480,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Simu ya mkononi"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Hakuna"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Data ya mtandao wa simu"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Data ya simu"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Data ya 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Data ya 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Inatumika sasa:"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Programu chaguo-msingi"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Lugha, wakati, hifadhi rudufu, masasisho"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mipangilio"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Tafuta kwenye mipangilio"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Tafuta kwenye mipangilio"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Mipangilio ya utafutaji"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Mipangilio ya utafutaji"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wi-fi, wi-fi, mtandao, muunganisho"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, kutuma SMS, ujumbe, kutuma ujumbe"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mtandao wa simu, rununu, mtoa huduma wa vifaa vya mkononi, isiyotumia waya, data, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ishara"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"lipa, gonga, malipo"</string>
     <string name="keywords_backup" msgid="470070289135403022">"hifadhi rudufu, hifadhi nakala"</string>
+    <!-- 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">"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>
@@ -2743,7 +2912,7 @@
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Sauti zote"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Sauti za maudhui pekee"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"Kimya"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Arifu"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Tahadhari"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tetema"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Washa sauti"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Hujawasha sheria zozote za kiotomatiki"</string>
@@ -2833,8 +3002,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>
@@ -2861,8 +3028,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Usiwahi kuonyesha arifa kwenye vifaa vya kando au katika kivuli"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"Ruhusu kitone cha arifa"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Onyesha kitone cha arifa"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Hali ya \'Usinisumbue\' isizingatiwe"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ruhusu arifa hizi ziendelee kuingia wakati hali ya Usinisumbue imewekwa katika Kipaumbele Pekee"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Batilisha hali ya \'Usinisumbue\'"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ruhusu arifa hizi ziendelee kukatiza wakati hali ya Usinisumbue imewekwa katika Kipaumbele Pekee"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Skrini inapofungwa"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Imezuiwa"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Kipaumbele"</string>
@@ -2875,12 +3042,12 @@
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Futa"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Badilisha jina"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Jina la sheria"</string>
-    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Andika jina la sheria"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Ingiza jina la sheria"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Jina la sheria linatumika tayari"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Ongeza zingine"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Ongeza zaidi"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Futa sheria"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Chagua aina ya sheria"</string>
-    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Je, ungependa kuifuta sheria ya \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Je, ungependa kufuta \"<xliff:g id="RULE">%1$s</xliff:g>\" sheria?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Futa"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Aina ya sheria"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Isiyojulikana"</string>
@@ -2895,7 +3062,7 @@
     <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Ambapo jibu ni <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Kalenda yoyote"</string>
     <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Ambapo jibu ni"</string>
-    <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"Ndiyo, Labda au Jibu halijatolewa"</string>
+    <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"Ndiyo, Labda, au Hakuna jibu"</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"Ndiyo au Labda"</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"Ndiyo"</string>
     <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Sheria haikupatikana."</string>
@@ -2904,13 +3071,13 @@
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Siku"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Hamna"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Kila siku"</string>
-    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Kengele inaweza kulia kabla kipindi kilichoteuliwa kuisha"</string>
-    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Komesha tukio litakapokwisha au wakati wa kengele itakayofuata, kulingana na litakalotangulia"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Kengele inaweza kubatilisha wakati tukio litakwisha"</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Komesha wakati tukio litakwisha au kengele itakayofuata, inategemea hali itakayotangulia"</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> hadi <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Simu zilizopigwa"</string>
-    <string name="zen_mode_messages" msgid="5886440273537510894">"Ujumbe"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Barua pepe"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Ujumbe wote"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Ujumbe uliochaguliwa"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Kutoka kwa mtu yeyote"</string>
@@ -2965,11 +3132,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Wasifu huu wa kazini unasimamiwa na:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Inasimamiwa na <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Majaribio)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Kuzunguka kwenye skrini ya kifaa"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Zungusha maudhui ya skrini"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Skrini ibaki katika onyesho la wima"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Baki katika onyesho la mlalo"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Baki katika mkao wa sasa"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Uanzishaji salama"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Endelea"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba PIN yako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe PIN kabla ya kufunguka?"</string>
@@ -2977,7 +3139,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba nenosiri lako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe nenosiri kabla ya kufunguka?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Mbali na kutumia alama yako ya kidole, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba PIN yako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe PIN kabla ya kufunguka?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Mbali na kutumia alama yako ya kidole kufungua kifaa chako, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba mchoro wako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe mchoro kabla ya kufunguka?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Mbali na kutumia alama ya kidole ili kufungua kifaa chako, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba nenosiri lako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe nenosiri kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Mbali na kutumia alama ya kidole chako kufungua kifaa, unaweza kulinda kifaa hiki zaidi kwa kuweka nenosiri lako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe nenosiri kabla ya kuanza kukitumia?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ndiyo"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Hapana"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Je, inahitaji PIN?"</string>
@@ -2990,13 +3152,13 @@
     <string name="imei_information_title" msgid="8499085421609752290">"Maelezo ya IMEI"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"Maelezo ya IMEI yanayohusiana"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Nafasi<xliff:g id="SLOT_NUM">%1$d</xliff:g> )"</string>
-    <string name="launch_by_default" msgid="1840761193189009248">"Fungua moja kwa moja"</string>
+    <string name="launch_by_default" msgid="1840761193189009248">"Fungua kwa chaguo-msingi"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Viungo vya kufungua"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Fungua viungo vinavyoweza kutumika"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Fungua bila kuuliza"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Viungo vinavyoweza kutumika"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Chaguo-msingi nyingine"</string>
-    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> zimetumika katika <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> imetumika katika <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Hifadhi ya mfumo"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Hifadhi ya nje"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Matumizi ya data ya programu"</string>
@@ -3095,14 +3257,20 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
-    <string name="high_power_system" msgid="7362862974428225301">"Chaguo la kuboresha matumizi ya betri halipo"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Chaguo la kuboresha matumizi ya betri halipatikani"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Usitumie kipengele cha kuboresha matumizi ya betri. Kinaweza kumaliza chaji ya betri yako haraka zaidi."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Ungependa kuruhusu programu itumike chini chini kila wakati?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Ukiruhusu <xliff:g id="APP_NAME">%1$s</xliff:g> kutumika chini chini, unaweza kupunguza muda wa matumizi ya betri. \n\nUnaweza kubadilisha hali hii baadaye katika Mipangilio &gt; Programu na arifa."</string>
-    <string name="battery_summary" msgid="8044042095190688654">"Imetumia <xliff:g id="PERCENTAGE">%1$s</xliff:g> tangu mwisho ilipojazwa chaji"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"Imetumia <xliff:g id="PERCENTAGE">%1$s</xliff:g> tangu ilipojazwa chaji mara ya mwisho"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Udhibiti wa betri"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Hakuna matumizi ya betri tangu ijazwe chaji mara ya mwisho"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Mipangilio ya programu"</string>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Sakinisha programu ambazo hazijulikani"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Ruhusa ya programu ya kubadilisha mipangilio ya mfumo"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Ruhusu ubadilishaji wa mipangilio ya mfumo"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Idhini hii huruhusu programu kubadilisha mipangilio ya mfumo"</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ndiyo"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Hapana"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Ruhusu kutoka chanzo hiki"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kunja mkon mara mbili ili ufungue kamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Fungua programu ya kamera kwa kukunja kifundo cha mkono wako mara mbili"</string>
@@ -3230,7 +3397,7 @@
       <item quantity="other">Zimezimwa katika programu <xliff:g id="COUNT">%d</xliff:g></item>
       <item quantity="one">Zimezimwa katika programu 1</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"Zimewashwa katika programu zote"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"Iwashwe katika programu zote"</string>
     <string name="apps_summary" msgid="193158055537070092">"Programu <xliff:g id="COUNT">%1$d</xliff:g> zimesakinishwa"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"Imesakanisha programu 24"</string>
     <string name="storage_summary" msgid="3801281635351732202">"Imetumia <xliff:g id="PERCENTAGE">%1$s</xliff:g> - imesalia <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">Programu 1 imeruhusiwa kutumia data bila kudhibitiwa wakati Kiokoa Data kimewashwa</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Kiokoa data"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Kufikia data bila vikwazo"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Data isiyo na kikomo"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Data ya chini chini imezimwa"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Kimewashwa"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Kimezimwa"</string>
@@ -3333,7 +3499,7 @@
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Fungua kwa kidole tofauti"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Imewashwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Kimezimwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Kisiwahi kujiwasha kiotomatiki"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Kisiwahi kuwashwa kiotomatiki"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Washa kiotomatiki wakati chaji ya betri imefika %1$s"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Haitumii kipengele cha kuboresha matumizi ya betri"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Ikiwa kifaa kimefungwa, usiruhusu uchapaji wa majibu au maandishi mengine kwenye arifa"</string>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatiki"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Mwongozo"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Futa ili uongeze nafasi sasa"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Ishara"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Njia za mkato za ishara"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Ishara za kutekelezwa kwa haraka ili kudhibiti simu yako"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Ishara za haraka za kudhibiti kompyuta yako kibao"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Ishara za haraka za kudhibiti kifaa chako"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Nenda kwenye kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Ili ufungue kamera haraka, bofya kitufe cha kuwasha/kuzima mara mbili. Hufanya kazi katika skrini yoyote."</string>
+    <!-- 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">"Geuza kamera"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Inua simu ili ufungue kamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Ili ufungue kamera kiotomatiki, inua simu yako iwe tayari kupiga picha (mlalo au wima). Hufanya kazi wakati simu yako iko kwenye hali tulivu au imefungwa."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Piga picha simu ikiwa katika hali tuli au ikiwa imefungwa"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Ishara ya usaidizi"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Utambuzi"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index 7ae4061..35a25d8 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 0000000..f69f7c3
--- /dev/null
+++ b/res/values-sw400dp/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<resources>
+
+    <!-- Unhide the icon on bigger screens -->
+    <style name="LockPatternIconStyle" parent="SuwGlifIcon" />
+
+</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 0157fa2..0411914 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 87a941d..e9fe8f7 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"நன்று"</item>
     <item msgid="8986346415847956850">"பிரமாதம்"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"எப்போதும்"</item>
-    <item msgid="844721238536786870">"செருகப்பட்டிருக்கும்போது மட்டும்"</item>
-    <item msgid="1986753720941888596">"எப்போதும் வேண்டாம்"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"எப்போதும்"</item>
-    <item msgid="7433294150916905997">"செருகப்பட்டிருக்கும்போது மட்டும்"</item>
-    <item msgid="1390404486722375028">"ஒருபோதும் வேண்டாம்"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"கடந்த 30 நாட்கள்"</item>
     <item msgid="6600989128423965319">"பயன்பாட்டு சுழற்சியை அமை..."</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 002c71d..3ae0b31 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -23,13 +23,13 @@
     <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="other">டெவெலப்பராவதற்கு இப்போது <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> படிகளே உள்ளன.</item>
       <item quantity="one">டெவெலப்பராவதற்கு இப்போது <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> படியே உள்ளது.</item>
     </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 +41,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 +107,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">"புளுடூத் அமைப்புகளை மாற்ற உங்களுக்கு அனுமதியில்லை."</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> தெரியும்."</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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> உங்கள் சிம் கார்டை அணுக விரும்புகிறது. சிம் கார்டிற்கு அணுகல் வழங்குவது இணைப்பின் போது, உங்கள் சாதனத்தின் தரவு இணைப்பை முடக்கும். <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">"தேதி &amp; நேரம்"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"நேரமண்டலத்தைத் தேர்வுசெய்க"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"கணக்குகள்"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"இருப்பிடம்"</string>
     <string name="account_settings_title" msgid="626177544686329806">"கணக்குகள்"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"பாதுகாப்பு &amp; இருப்பிடம்"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"என்கிரிப்ஷன் &amp; அனுமதிச் சான்றுகள்"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ஃபோன் என்கிரிப்ட் செய்யப்பட்டது"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"சாதனம் என்கிரிப்ட் செய்யப்பட்டது"</string>
@@ -354,40 +378,55 @@
     <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>
+    <!-- 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>
@@ -449,6 +488,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 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"திறப்பதற்கான வடிவத்தை மாற்று"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"திறக்கும் பின்னை மாற்று"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"திறப்பதற்கான கடவுச்சொல்லை மாற்று"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"மீண்டும் முயலவும். <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> முயற்சி."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"கடைசி முயற்சி"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"இந்த முயற்சியில் தவறான பணிப் பேட்டர்னை உள்ளிட்டால், உங்கள் பணிச் சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"இந்த முயற்சியில் தவறான பணிப் பின்னை உள்ளிட்டால், உங்கள் பணிச் சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"இந்த முயற்சியில் தவறான பணிக் கடவுச்சொல்லை உள்ளிட்டால், உங்கள் பணிச் சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"அதிகப்படியான தவறான முயற்சிகள். உங்கள் பணி சுயவிவரமும் தொடர்புடைய தரவும் இந்தச் சாதனத்திலிருந்து அகற்றப்படும்."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"நிராகரி"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"மீண்டும் முயலவும். <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> இல் <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> முறை முயன்றுவிட்டீர்கள்."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"உங்கள் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"அடுத்த முறை தவறான பேட்டர்னை வரைந்தால், இந்தச் சாதனங்களின் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"அடுத்த முறை தவறான பின்னை உள்ளிட்டால், இந்தச் சாதனங்களின் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"அடுத்த முறை தவறான கடவுச்சொல்லை உள்ளிட்டால், இந்தச் சாதனங்களின் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"அடுத்த முறை தவறான பேட்டர்னை வரைந்தால், இந்தப் பயனர் நீக்கப்படுவார்"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"அடுத்த முறை தவறான பின்னை வழங்கினால், இந்தப் பயனர் நீக்கப்படுவார்"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"அடுத்த முறை தவறான கடவுச்சொல்லை உள்ளிட்டால், இந்தப் பயனர் நீக்கப்படுவார்"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"அடுத்த முறை தவறான பேட்டர்னை வரைந்தால், உங்கள் பணி விவரமும் அதன் தரவும் நீக்கப்படும்"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"அடுத்த முறை தவறான பின்னை உள்ளிட்டால், உங்கள் பணி விவரமும் அதன் தரவும் நீக்கப்படும்"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"அடுத்த முறை தவறான கடவுச்சொல்லை உள்ளிட்டால், உங்கள் பணி விவரமும் அதன் தரவும் நீக்கப்படும்"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"பலமுறை தவறாக முயன்றதால், இந்தச் சாதனங்களின் தரவு நீக்கப்படும்."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"பலமுறை தவறாக முயன்றதால், இந்தப் பயனர் நீக்கப்படுவார்."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"பலமுறை தவறாக முயன்றதால், இந்தப் பணி விவரமும் அதன் தரவும் நீக்கப்படும்."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"நிராகரி"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"குறைந்தது <xliff:g id="COUNT">%d</xliff:g> எழுத்துகள் இருக்க வேண்டும்"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"பின்னானது குறைந்தது <xliff:g id="COUNT">%d</xliff:g> இலக்கங்கள் இருக்க வேண்டும்"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"தொடர்க"</string>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +812,6 @@
     <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">"வைஃபை இணைப்பு துண்டிக்கப்பட்டது. 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>
@@ -810,7 +874,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 +910,28 @@
     <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>
+    <!-- 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_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">"ஹாட்ஸ்பாட்டை இயக்குகிறது…"</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 +978,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>
@@ -980,23 +1063,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1113,19 @@
     <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>
+    <!-- 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">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
@@ -1273,6 +1377,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN வெறுமையாக இருக்கக்கூடாது."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC புலத்தில் 3 இலக்கங்களாவது இருக்க வேண்டும்."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC புலம் கண்டிப்பாக 2 அல்லது 3 இலக்கங்களில் இருக்க வேண்டும்."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"%s வகை APNகளைச் சேர்க்க, தொலைத்தொடர்பு நிறுவனம் அனுமதிக்கவில்லை."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"இயல்புநிலை APN அமைப்புகளை மீட்டமைக்கிறது."</string>
     <string name="menu_restore" msgid="8260067415075573273">"இயல்புநிலைக்கு மீட்டமை"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"இயல்புநிலை APN அமைப்புகளை மீட்டமைப்பது முடிந்தது."</string>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD கார்டை அழி"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"இசை அல்லது படங்கள் போன்று அக USB சேமிப்பிடத்தில் உள்ள எல்லா தரவையும் அழி"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"இசை அல்லது படங்கள் போன்று SD கார்டில் உள்ள எல்லா தரவையும் அழி"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"இ-சிம்களை அழி"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"மொபைலில் உள்ள எல்லா இ-சிம்களும் அழிக்கப்படும். ஆனால், உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"டேப்லெட்டில் உள்ள எல்லா இ-சிம்களும் அழிக்கப்படும். ஆனால், உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"டேப்லெட்டை மீட்டமை"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"மொபைலை மீட்டமை"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"உங்களின் தனிப்பட்ட தகவல், பதிவிறக்கிய பயன்பாடுகள் எல்லாவற்றையும் அழிக்கவா? இதைச் செயல்தவிர்க்க முடியாது!"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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>
@@ -1363,7 +1465,7 @@
     <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_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>
@@ -1376,7 +1478,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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1658,7 @@
     <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="default" msgid="1477351142334784771">"SD கார்டில் உள்ளவை"</string>
+    <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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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">"மொழிகள் &amp; உள்ளீடு"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"மொழிகள் &amp; உள்ளீடு"</string>
     <string name="input_assistance" msgid="7577795275222555487">"உள்ளிடுவதற்கான உதவி"</string>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"CPU மொத்தம்"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU முன்புறம்"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"எப்போதும் விழிப்பில்"</string>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2550,10 +2711,10 @@
     <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_favor_default" msgid="5743781166099608372">"எப்போதும்"</string>
-    <string name="nfc_payment_favor_open" msgid="1923314062109977944">"மற்றொரு பேமெண்ட் பயன்பாடு திறந்திருக்கும் சமயங்கள் தவிர"</string>
+    <string name="nfc_payment_favor_open" msgid="1923314062109977944">"மற்றொரு பேமண்ட் பயன்பாடு திறந்திருக்கும் சமயங்கள் தவிர"</string>
     <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_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>
@@ -2654,17 +2815,20 @@
       <item quantity="one">மறைந்துள்ள %d உருப்படியைக் காட்டு</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"நெட்வொர்க் &amp; இணையம்"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"வைஃபை, மொபைல், தரவு உபயோகம், ஹாட்ஸ்பாட்"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"மொபைல்"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"தரவு உபயோகம்"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"ஹாட்ஸ்பாட்"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"இணைத்த சாதனங்கள்"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"புளூடூத், Cast, NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"புளூடூத், அனுப்புதல்"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"பயன்பாடுகள் &amp; அறிவிப்புகள்"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"அனுமதிகள், இயல்புப் பயன்பாடுகள்"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"பயனர்களும் கணக்குகளும்"</string>
     <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_mobile_networks" msgid="8995946622054642367">"செல்லுலார், மொபைல், செல் கேரியர், வயர்லெஸ், தரவு, 4g,3g, 2g, lte"</string>
@@ -2709,6 +2873,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">"வைஃபை NFC குறியை அமை"</string>
     <string name="write_tag" msgid="8571858602896222537">"எழுது"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"எழுத, குறியைத் தட்டவும்..."</string>
@@ -2827,14 +2997,12 @@
     <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_empty_text" msgid="685224245260197779">"நிறுவிய பயன்பாடுகள் எதுவும் பிக்ச்சர்-இன்-பிக்ச்சரை ஆதரிக்கவில்லை"</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_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="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="manage_zen_access_title" msgid="2611116122628520522">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகல்"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
@@ -2965,11 +3133,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 +3140,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 +3258,12 @@
     <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>
+    <!-- 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>
@@ -3187,8 +3356,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="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>
@@ -3200,8 +3370,6 @@
     <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_switch_title" msgid="3621381992793251070">"இந்த மூலத்திலிருந்து அனுமதி"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"கேமராவைத் திறக்க, இருமுறை திருப்புதல்"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"உங்கள் மணிக்கட்டை இருமுறை திருப்புவதன் மூலம் கேமரா பயன்பாட்டைத் திறக்கலாம்"</string>
@@ -3296,8 +3464,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 +3484,7 @@
       <item quantity="one">தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, வரம்பற்ற தரவைப் பயன்படுத்த 1 பயன்பாடு அனுமதிக்கப்பட்டது</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"தரவுச் சேமிப்பான்"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"வரம்பற்ற தரவு அணுகல்"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"வரம்பற்ற தரவு"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"பின்புலத் தரவு முடக்கப்பட்டது"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"இயக்கத்தில்"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"முடக்கத்தில்"</string>
@@ -3382,7 +3549,6 @@
     <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_warning" msgid="9086859595338944882">"பிரீமிய SMSக்குக் கட்டணம் விதிக்கப்படலாம், அது மொபைல் நிறுவன பில்களில் சேர்க்கப்படும். பயன்பாட்டிற்கான அனுமதியை இயக்கினால், அந்தப் பயன்பாட்டைப் பயன்படுத்தி பிரீமிய SMSஐ அனுப்ப முடியும்."</string>
@@ -3447,28 +3613,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3572,6 +3765,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 +3779,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"இன்ஸ்டண்ட் பயன்பாடு"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"சேமிப்பக நிர்வாகியை முடக்கவா?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"திரைப்படம் &amp; டிவி பயன்பாடுகள்"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"பயன்படுத்திய இட அளவு"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Carrier Provisioning Info"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
+    <!-- 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-te/arrays.xml b/res/values-te/arrays.xml
index 1dc9f03..d0c965a 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"బాగుంది"</item>
     <item msgid="8986346415847956850">"అద్భుతం"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ఎల్లప్పుడూ"</item>
-    <item msgid="844721238536786870">"ప్లగిన్ చేయబడినప్పుడు మాత్రమే"</item>
-    <item msgid="1986753720941888596">"ఎప్పటికీ వద్దు"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ఎల్లప్పుడూ"</item>
-    <item msgid="7433294150916905997">"ప్లగిన్ చేయబడినప్పుడు మాత్రమే"</item>
-    <item msgid="1390404486722375028">"ఎప్పటికీ వద్దు"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"గత 30 రోజులు"</item>
     <item msgid="6600989128423965319">"విని. పునరా. సెట్ చేయి..."</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index d948936..43f61a4 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -23,13 +23,13 @@
     <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="other">మీరు ఇప్పుడు డెవలపర్ కావడానికి <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> అడుగుల దూరంలో ఉన్నారు.</item>
       <item quantity="one">మీరు ఇప్పుడు డెవలపర్ కావడానికి <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> అడుగు దూరంలో ఉన్నారు.</item>
     </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 +41,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 +107,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">"మీకు బ్లూటూత్ సెట్టింగ్‌లను మార్చడానికి అనుమతి లేదు."</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> సమీప పరికరాలకు కనిపిస్తుంది."</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>
@@ -121,28 +138,29 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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_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_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_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_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_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>
@@ -157,6 +175,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">"తేదీ &amp; సమయం"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"సమయ మండలిని ఎంచుకోండి"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -313,8 +336,8 @@
     <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>
-    <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" 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>
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ఖాతాలు"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"స్థానం"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ఖాతాలు"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"భద్రత &amp; స్థానం"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"గుప్తీకరణ &amp; ఆధారాలు"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ఫోన్ గుప్తీకరించబడింది"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"డివైజ్ గుప్తీకరించబడింది"</string>
@@ -353,47 +377,62 @@
     <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>
+    <!-- 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" 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>
@@ -408,8 +447,8 @@
     <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>
@@ -449,18 +488,20 @@
     <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_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>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"భద్రత వద్దు"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"ఆకృతి"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"నమూనా"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"మధ్యస్థ భద్రత"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"పిన్‌"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"మధ్యస్థం నుండి అధిక భద్రత"</string>
@@ -468,7 +509,7 @@
     <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="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"వేలిముద్ర + ఆకృతి"</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>
@@ -476,21 +517,21 @@
     <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_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_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">
+</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">
 
-</xliff:g>అలాగే మీ సేవ్ చేయబడిన వేలిముద్రలు ఈ డివైజ్ నుండి తీసివేయబడతాయి, ఆపై మీరు వాటితో మీ ఫోన్‌ను అన్‌లాక్ చేయలేరు, కొనుగోళ్లను ప్రామాణీకరించలేరు లేదా యాప్‌లకు సైన్ ఇన్ చేయలేరు.\""</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">
 
@@ -499,14 +540,14 @@
     <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>
-    <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_profile" msgid="8682200103576359918">"ప్రొఫైల్ సంరక్షణ లక్షణాలు మీ నమూనా లేకుండా పని చేయవు."</string>
+    <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">"ప్రొఫైల్ సంరక్షణ ఫీచర్‌లు మీ పిన్ లేకుండా పని చేయవు."</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_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>
+</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">
 
@@ -519,20 +560,28 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"అన్‌లాక్ నమూనాను మార్చు"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"అన్‌లాక్ పిన్‌ను మార్చండి"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"అన్‌లాక్ పాస్‌వర్డ్‌ను మార్చు"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"మళ్లీ ప్రయత్నించండి. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>లో <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>వ ప్రయత్నం చేసారు."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"చివరి ప్రయత్నం"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"మీరు ఈ ప్రయత్నంలో తప్పు కార్యాలయ నమూనాను నమోదు చేస్తే, ఈ పరికరం నుండి మీ కార్యాలయ ప్రొఫైల్ మరియు అనుబంధిత డేటా తీసివేయబడతాయి."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"మీరు ఈ ప్రయత్నంలో తప్పు కార్యాలయ పిన్‌ను నమోదు చేస్తే, ఈ డివైజ్ నుండి మీ కార్యాలయ ప్రొఫైల్ మరియు అనుబంధిత డేటా తీసివేయబడతాయి."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"మీరు ఈ ప్రయత్నంలో తప్పు కార్యాలయ పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ పరికరం నుండి మీ కార్యాలయ ప్రొఫైల్ మరియు అనుబంధిత డేటా తీసివేయబడతాయి."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ పరికరం నుండి మీ కార్యాలయ ప్రొఫైల్ మరియు అనుబంధిత డేటా తీసివేయబడతాయి."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"తీసివేయి"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"మళ్లీ ప్రయత్నించండి. <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>లో <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ప్రయత్నం చేసారు."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"మీ డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"మీరు తదుపరి ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"మీరు తదుపరి ప్రయత్నంలో తప్పు PINను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"మీరు తదుపరి ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"మీరు తదుపరి ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"మీరు తదుపరి ప్రయత్నంలో తప్పు PINను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"మీరు తదుపరి ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ వినియోగదారు తొలగించబడతారు"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"మీరు తదుపరి ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"మీరు తదుపరి ప్రయత్నంలో తప్పు PINను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"మీరు తదుపరి ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, మీ కార్యాలయ ప్రొఫైల్‌ మరియు దీని డేటా తొలగించబడతాయి"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ వినియోగదారు తొలగించబడతారు."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ కార్యాలయ ప్రొఫైల్ మరియు దీని డేటా తొలగించబడతాయి."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"తీసివేయండి"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"తప్పనిసరిగా కనీసం <xliff:g id="COUNT">%d</xliff:g> అక్షరాలను కలిగి ఉండాలి"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"పిన్ తప్పనిసరిగా కనీసం <xliff:g id="COUNT">%d</xliff:g> అంకెలను కలిగి ఉండాలి"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"కొనసాగించండి"</string>
     <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>
@@ -571,8 +620,8 @@
     <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>
@@ -592,7 +641,7 @@
     <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_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>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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>
@@ -673,7 +738,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>
@@ -747,7 +812,6 @@
     <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_ssid" msgid="5519636102673067319">"నెట్‌వర్క్ పేరు"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSIDని నమోదు చేయండి"</string>
     <string name="wifi_security" msgid="6603611185592956936">"భద్రత"</string>
@@ -810,7 +874,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 +910,28 @@
     <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>
+    <!-- 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_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">"హాట్‌స్పాట్‌ను ప్రారంభిస్తోంది…"</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 +978,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>
@@ -980,24 +1063,34 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1113,19 @@
     <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>
+    <!-- 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">"సిమ్ కార్డు లాక్ సెట్టింగ్‌లు"</string>
@@ -1055,10 +1159,10 @@
     <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_preferred_message" msgid="8466930554330635780">"మీ పరికరంలో <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM మాత్రమే ఉంది. మొబైల్ డేటా, కాల్‌లు మరియు SMS సందేశాల కోసం మీరు ఈ SIMని ఉపయోగించాలనుకుంటున్నారా?"</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="other">SIM పిన్ కోడ్ తప్పు, మీకు మరో <xliff:g id="NUMBER_1">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి.</item>
-      <item quantity="one">SIM పిన్ కోడ్ చెల్లదు, మీరు మీ డివైజ్‌ను అన్‌లాక్ చేయడానికి తప్పనిసరిగా మీ క్యారియర్‌ను సంప్రదించడానికి ముందు మీకు <xliff:g id="NUMBER_0">%d</xliff:g> ప్రయత్నం మిగిలి ఉంది.</item>
+      <item quantity="other">SIM పిన్ కోడ్ చెల్లదు, మీకు <xliff:g id="NUMBER_1">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి.</item>
+      <item quantity="one">SIM పిన్ కోడ్ చెల్లదు, మీరు మీ పరికరాన్ని అన్‌లాక్ చేయడానికి తప్పనిసరిగా మీ క్యారియర్‌ను సంప్రదించడానికి ముందు మీకు <xliff:g id="NUMBER_0">%d</xliff:g> ప్రయత్నం మిగిలి ఉంది.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"సిమ్ పిన్ చర్య విఫలమైంది!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"టాబ్లెట్ స్థితి"</string>
@@ -1230,7 +1334,7 @@
     <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>
-    <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_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>
@@ -1273,6 +1377,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN ఖాళీగా ఉండకూడదు."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC ఫీల్డ్ తప్పనిసరిగా 3 అంకెలు కలిగి ఉండాలి."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC ఫీల్డ్‌లో తప్పనిసరిగా 2 లేదా 3 అంకెలు ఉండాలి."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"క్యారియర్ %s రకమైన APNలను జోడించడాన్ని అనుమతించదు."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"డిఫాల్ట్ APN సెట్టింగ్‌లను పునరుద్ధరిస్తోంది."</string>
     <string name="menu_restore" msgid="8260067415075573273">"డిఫాల్ట్‌కు రీసెట్ చేయి"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"డిఫాల్ట్ APN సెట్టింగ్‌లను రీసెట్ చేయడం పూర్తయింది."</string>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD కార్డుని ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"అంతర్గత USB నిల్వలోని డేటా అంతటినీ అనగా సంగీతం లేదా ఫోటోల వంటివి ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD కార్డు‌లో సంగీతం లేదా ఫోటోల వంటి మొత్తం డేటాను ఎరేజ్ చేయి"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIMలను తొలగించండి"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ఫోన్‌లో అన్ని eSIMలను తుడిచివేయండి. దీని కారణంగా మీ మొబైైల్ సేవా ప్లాన్ రద్దు చేయబడదు."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"టాబ్లెట్‌లో అన్ని eSIMలను తుడిచివేయండి. దీని కారణంగా మీ మొబైైల్ సేవా ప్లాన్ రద్దు చేయబడదు."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"టాబ్లెట్‌ను రీసెట్ చేయి"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ఫోన్‌ను రీసెట్ చేయి"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"మీ వ్యక్తిగత సమాచారం మరియు డౌన్‌లోడ్ చేసిన అనువర్తనాలు అన్నింటినీ తొలగించాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
@@ -1324,30 +1432,24 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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">"మీ SMS అనువర్తనంగా <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">"మీ SMS అనువర్తనంగా <xliff:g id="NEW_APP">%s</xliff:g>ని ఉపయోగించాలా?"</string>
@@ -1363,7 +1465,7 @@
     <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_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>
@@ -1376,7 +1478,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>
@@ -1431,22 +1533,22 @@
     <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_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_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_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_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="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>
@@ -1454,15 +1556,15 @@
     <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_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>
     <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>
+    <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_visible_pattern_title" msgid="2615606088906120711">"నమూనాను కనిపించేలా చేయి"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"ప్రొఫైల్ నమూనాను కనిపించేలా చేయి"</string>
@@ -1473,7 +1575,7 @@
     <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="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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1510,10 +1618,10 @@
     </plurals>
     <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="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="default" msgid="626414192825329708">"SD కార్డు"</string>
@@ -1528,15 +1636,15 @@
     <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>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"ఈ అనువర్తనం మీ స్క్రీన్ కోసం రూపొందించబడి ఉండకపోవచ్చు. మీరు దీన్ని మీ స్క్రీన్‌కు ఎలా సర్దుబాటు చేయాలనేదాన్ని ఇక్కడ నియంత్రించవచ్చు."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"ప్రారంభించేటప్పుడు అడుగు"</string>
-    <string name="enable_compatibility" msgid="5806819252068617811">"స్కేల్ యాప్"</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_size" msgid="7024513286636502362">"పరిమాణం ద్వారా క్రమబద్ధీకరించు"</string>
     <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="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>
@@ -1550,6 +1658,7 @@
     <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="default" msgid="1477351142334784771">"SD కార్డులో"</string>
+    <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>
@@ -1563,20 +1672,20 @@
     <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="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_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>
     <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_billing_desc" msgid="8061019011821282358">"ఈ అనువర్తనం మీకు ఛార్జీ విధించబడేలా చేయవచ్చు:"</string>
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ప్రీమియం SMS పంపండి"</string>
     <string name="computing_size" msgid="1599186977475211186">"గణిస్తోంది…"</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"ప్యాకేజీ పరిమాణాన్ని గణించడం సాధ్యపడలేదు."</string>
@@ -1590,8 +1699,8 @@
     <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="does_not_exist" msgid="1501243985586067053">"యాప్ ఉనికిలో లేదు."</string>
-    <string name="app_forward_locked" msgid="6331564656683790866">"యాప్ కాపీ-రక్షితమైనది."</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="move_error_device_admin" msgid="8673026002690505763">"పరికర నిర్వాహకుల అనువర్తనాన్ని బాహ్య మీడియాలో ఇన్‌స్టాల్ చేయలేరు"</string>
@@ -1610,9 +1719,9 @@
     <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_summary" msgid="6464796332049327547">"యాప్ <xliff:g id="APP_STORE">%1$s</xliff:g> నుండి ఇన్‌స్టాల్ చేయబడింది"</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_settings" msgid="5108481883575527511">"అనువర్తనం చర్యలు"</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>
@@ -1621,7 +1730,7 @@
     <string name="service_restarting" msgid="2242747937372354306">"పునఃప్రారంభం అవుతోంది"</string>
     <string name="cached" msgid="1059590879740175019">"కాష్ చేయబడిన నేపథ్య ప్రాసెస్"</string>
     <string name="no_running_services" msgid="2059536495597645347">"ఏవీ అమలు కావడం లేదు."</string>
-    <string name="service_started_by_app" msgid="818675099014723551">"యాప్ ద్వారా ప్రారంభించబడింది."</string>
+    <string name="service_started_by_app" msgid="818675099014723551">"అనువర్తనం ద్వారా ప్రారంభించబడింది."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> ఖాళీ"</string>
@@ -1643,13 +1752,13 @@
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"ఉపయోగించబడినది"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"కాష్ చేయబడినది"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"RAMలో <xliff:g id="RAM_0">%1$s</xliff:g>"</string>
-    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"అమలవుతున్న యాప్"</string>
+    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"అమలవుతున్న అనువర్తనం"</string>
     <string name="no_services" msgid="7133900764462288263">"సక్రియంగా లేవు"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"సేవలు"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"ప్రాసెస్‌లు"</string>
     <string name="service_stop" msgid="6369807553277527248">"ఆపివేయండి"</string>
     <string name="service_manage" msgid="1876642087421959194">"సెట్టింగ్‌లు"</string>
-    <string name="service_stop_description" msgid="9146619928198961643">"ఈ సేవ దీని యాప్ ద్వారా ప్రారంభించబడింది. దీన్ని ఆపివేయడం వలన యాప్ విఫలం కావచ్చు."</string>
+    <string name="service_stop_description" msgid="9146619928198961643">"ఈ సేవ దీని అనువర్తనం ద్వారా ప్రారంభించబడింది. దీన్ని ఆపివేయడం వలన అనువర్తనం విఫలం కావచ్చు."</string>
     <string name="heavy_weight_stop_description" msgid="6050413065144035971">"ఈ అనువర్తనాన్ని సురక్షితంగా ఆపివేయడం కుదరదు. దీన్ని ఆపివేస్తే, మీరు ప్రస్తుతం చేస్తోన్న పనిలో కొంత భాగాన్ని కోల్పోడానికి అవకాశం ఉంది."</string>
     <string name="background_process_stop_description" msgid="3834163804031287685">"ఇది మళ్లీ అవసరమయ్యే పరిస్థితుల్లో అప్పటికీ అమలయ్యే పాత అనువర్తన ప్రాసెస్. సాధారణంగా దీన్ని ఆపడానికి కారణం ఏదీ ఉండదు."</string>
     <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: ప్రస్తుతం వినియోగంలో ఉంది. దాన్ని నియంత్రించడానికి సెట్టింగ్‌లు నొక్కండి."</string>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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">"భాషలు &amp; ఇన్‌పుట్"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"భాషలు &amp; ఇన్‌పుట్"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ఇన్‌పుట్ సహాయకం"</string>
@@ -1674,7 +1788,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>
@@ -1749,7 +1863,7 @@
     <string name="usage_stats_label" msgid="5890846333487083609">"వినియోగ గణాంకాలు"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"వినియోగ గణాంకాలు"</string>
     <string name="display_order_text" msgid="8592776965827565271">"ఇలా క్రమబద్ధీకరించు:"</string>
-    <string name="app_name_label" msgid="5440362857006046193">"యాప్"</string>
+    <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>
@@ -1853,7 +1967,7 @@
     <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="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>
@@ -1873,6 +1987,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>
@@ -1903,11 +2021,11 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> ఉంది"</string>
     <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_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_disabled" msgid="3710669050484599847">"నేపథ్యంలో అమలు కావడానికి యాప్ అనుమతించబడలేదు"</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>
@@ -1939,6 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"CPU మొత్తం"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ముందుభాగం"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"సక్రియంగా ఉంచండి"</string>
@@ -1975,7 +2134,7 @@
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"మొత్తం బ్యాటరీ సామర్థ్యం"</string>
     <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_stop" msgid="649958863744041872">"నిర్బంధ ఆపివేత"</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>
@@ -1995,16 +2154,18 @@
     <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_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>
+    <!-- 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="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>
@@ -2082,7 +2243,7 @@
     <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">"ప్రసంగం రేట్ &amp; స్థాయి"</string>
@@ -2160,9 +2321,9 @@
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Google సర్వర్‌ల్లో మీ Wi‑Fi పాస్‌వర్డ్‌లు, బుక్‌మార్క్‌లు, ఇతర సెట్టింగ్‌లు మరియు అనువర్తన డేటాను బ్యాకప్ చేయడాన్ని ఆపివేయడంతో పాటు అదనంగా అన్ని కాపీలను ఎరేజ్ చేయాలా?"</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="fullbackup_data_summary" msgid="960850365007767734">"పరికర డేటా (Wi-Fi పాస్‌వర్డ్‌లు మరియు కాల్ చరిత్ర వంటివి) మరియు అనువర్తన డేటాను (సెట్టింగ్‌లు మరియు అనువర్తనాల ద్వారా నిల్వ చేయబడిన ఫైల్‌లు వంటివి) స్వయంచాలకంగా రిమోట్ విధానంలో బ్యాకప్ చేస్తుంది.\n\nమీరు స్వీయ బ్యాకప్‌ను ఆన్ చేసినప్పుడు, పరికర మరియు అనువర్తన డేటా కాలానుగుణంగా రిమోట్ విధానంలో సేవ్ చేయబడుతుంది. పరిచయాలు, సందేశాలు మరియు ఫోటోల వంటి సున్నితమైన వ్యక్తిగత డేటాతో సహా అనువర్తనం సేవ్ చేసిన (డెవలపర్ సెట్టింగ్‌ల ఆధారంగా) ఎలాంటి డేటా అయినా అనువర్తన డేటాగా పరిగణించబడుతుంది."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"పరికర నిర్వాహకుల సెట్టింగ్‌లు"</string>
-    <string name="active_device_admin_msg" msgid="578748451637360192">"డివైజ్ నిర్వాహకుల యాప్"</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>
@@ -2174,10 +2335,10 @@
     <string name="add_device_admin_msg" msgid="1501847129819382149">"పరికర నిర్వాహకుల అనువర్తనాన్ని సక్రియం చేయాలా?"</string>
     <string name="add_device_admin" msgid="4192055385312215731">"ఈ పరికర నిర్వాహకుల అనువర్తనాన్ని సక్రియం చేయి"</string>
     <string name="device_admin_add_title" msgid="3140663753671809044">"పరికర నిర్వాహకులు"</string>
-    <string name="device_admin_warning" msgid="7482834776510188134">"ఈ నిర్వాహకుల యాప్‌ను సక్రియం చేస్తే, కింది చర్యలను చేయడానికి <xliff:g id="APP_NAME">%1$s</xliff:g> యాప్ అనుమతించబడుతుంది:"</string>
-    <string name="device_admin_status" msgid="7234814785374977990">"ఈ నిర్వాహకుల యాప్ సక్రియంగా ఉంది మరియు కింది చర్యలు చేయడానికి <xliff:g id="APP_NAME">%1$s</xliff:g> యాప్‌ను అనుమతిస్తుంది:"</string>
+    <string name="device_admin_warning" msgid="7482834776510188134">"ఈ నిర్వాహకుల అనువర్తనాన్ని సక్రియం చేస్తే, కింది చర్యలను చేయడానికి <xliff:g id="APP_NAME">%1$s</xliff:g> అనువర్తనం అనుమతించబడుతుంది:"</string>
+    <string name="device_admin_status" msgid="7234814785374977990">"ఈ నిర్వాహకుల అనువర్తనం సక్రియంగా ఉంది మరియు కింది చర్యలు చేయడానికి <xliff:g id="APP_NAME">%1$s</xliff:g> అనువర్తనాన్ని అనుమతిస్తుంది:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"ప్రొఫైల్ నిర్వాహకుడిని సక్రియం చేయాలా?"</string>
-    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"కొనసాగిస్తే, మీ వినియోగదారును మీ నిర్వాహకులు నిర్వహించగలరు, దాని వలన మీ వ్యక్తిగత డేటాతో పాటు అనుబంధితంగా ఉన్న డేటా కూడా నిల్వ చేయబడవచ్చు.\n\nమీ నిర్వాహకులు నెట్‌వర్క్ కార్యకలాపం మరియు మీ డివైజ్ యొక్క స్థాన సమాచారంతో పాటు ఈ వినియోగదారుకు అనుబంధితంగా ఉన్న సెట్టింగ్‌లు, యాక్సెస్, యాప్‌లు మరియు డేటాని పర్యవేక్షించగలరు మరియు నిర్వహించగలరు."</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"కొనసాగిస్తే, మీ వినియోగదారును మీ నిర్వాహకులు నిర్వహించగలరు, దాని వలన మీ వ్యక్తిగత డేటాతో పాటు అనుబంధితంగా ఉన్న డేటా కూడా నిల్వ చేయబడవచ్చు.\n\nమీ నిర్వాహకులు నెట్‌వర్క్ కార్యాచరణ మరియు మీ పరికరం యొక్క స్థాన సమాచారంతో పాటు ఈ వినియోగదారుకు అనుబంధితంగా ఉన్న సెట్టింగ్‌లు, ప్రాప్యత, అనువర్తనాలు మరియు డేటాని పర్యవేక్షించగలరు మరియు నిర్వహించగలరు."</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"ఇతర ఎంపికలను మీ నిర్వాహకులు నిలిపివేసారు"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"మరిన్ని వివరాలు"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"శీర్షికలేనిది"</string>
@@ -2267,7 +2428,7 @@
     <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_pattern" msgid="8423835922362956999">"నమూనా తప్పు"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"పాస్‌వర్డ్ తప్పు"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"పిన్ తప్పు"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"తనిఖీ చేస్తున్నాము..."</string>
@@ -2328,7 +2489,7 @@
     <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>
@@ -2410,7 +2571,7 @@
     <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="1352832123114214283">"ఈ యాప్ ఎల్లప్పుడూ ఆన్‌లో ఉండే 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">"ప్రొఫైల్‌ని సవరించు"</string>
@@ -2418,7 +2579,7 @@
     <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>
-    <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"ఈ యాప్ మద్దతు ఇవ్వదు"</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>
@@ -2550,10 +2711,10 @@
     <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_favor_default" msgid="5743781166099608372">"ఎల్లప్పుడూ"</string>
-    <string name="nfc_payment_favor_open" msgid="1923314062109977944">"మరో చెల్లింపు యాప్ తెరిచి ఉన్నప్పుడు మినహా"</string>
+    <string name="nfc_payment_favor_open" msgid="1923314062109977944">"మరో చెల్లింపు అనువర్తనం తెరిచి ఉన్నప్పుడు మినహా"</string>
     <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_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>
@@ -2587,12 +2748,12 @@
     <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_restrictions_title" msgid="5794473784343434273">"అనువర్తనం &amp; కంటెంట్ ప్రాప్యత"</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="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">"బ్లూటూత్"</string>
@@ -2654,16 +2815,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="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="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>
@@ -2695,20 +2859,26 @@
     <string name="keywords_users" msgid="3434190133131387942">"పరిమితి, పరిమితం చేయి, పరిమితం చేయబడింది"</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">"అత్యవసరం, ice, యాప్, డిఫాల్ట్"</string>
+    <string name="keywords_emergency_app" msgid="3143078441279044780">"అత్యవసరం, ice, అనువర్తనం, డిఫాల్ట్"</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">"ఆప్టిమైజేషన్‌లు నిద్రావస్థ, యాప్ స్టాండ్‌బైలను  విస్మరించు"</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_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_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>
@@ -2728,7 +2898,7 @@
     <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_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>
@@ -2811,8 +2981,8 @@
     <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>
-      <item quantity="one"> %d యాప్ నోటిఫికేషన్‌లను చదవగలదు</item>
+      <item quantity="other">%d అనువర్తనాలు నోటిఫికేషన్‌లను చదవగలవు</item>
+      <item quantity="one">%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>
@@ -2828,21 +2998,19 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"అస్పష్టతను తగ్గించు (సిఫార్సు చేయబడింది)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"అస్థిరమైన ప్రకాశాన్ని తగ్గించు"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"చిత్రంలో చిత్రం"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"చిత్రంలో చిత్రానికి మద్దతిచ్చే అనువర్తనాలు ఏవీ ఇన్‌స్టాల్ చేయబడలేదు"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"చిత్రంలో-చిత్రానికి మద్దతిచ్చే అనువర్తనాలు ఏవీ ఇన్‌స్టాల్ చేయబడలేదు"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in"</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="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="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>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
@@ -2957,38 +3125,33 @@
     <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="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_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>
     <!-- unknown quoting pattern: original -1, translation 1 -->
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"మీ డివైజ్‌ను అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పిన్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. డివైజ్‌ను ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన డివైజ్‌లలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ డివైజ్‌ను ప్రారంభించడం కోసం పిన్‌ని అడగాలా&amp;gt;"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పిన్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పిన్‌ని అడగాలా&amp;gt;"</string>
     <!-- unknown quoting pattern: original -1, translation 1 -->
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ నమూనాని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం నమూనాని అడగాలా&amp;gt;"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పాస్‌వర్డ్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పాస్‌వర్డ్‌ని అడగాలా&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పాస్‌వర్డ్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పాస్‌వర్డ్‌ని అడగాలా?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"అవును"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"వద్దు"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"పిన్ అవసరమా?"</string>
-    <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ఆకృతి అవసరమా?"</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_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="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>
@@ -3044,7 +3207,7 @@
     <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="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>
@@ -3065,15 +3228,15 @@
     <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">"సహాయకం &amp; వాయిస్ ఇన్‌పుట్"</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_default_app" msgid="3091113402349739037">"(సిస్టమ్ డిఫాల్ట్)"</string>
@@ -3081,7 +3244,7 @@
     <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>
@@ -3097,6 +3260,12 @@
     <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>
+    <!-- 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>
@@ -3141,7 +3310,7 @@
     <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_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>
@@ -3158,17 +3327,17 @@
     <string name="free_memory" msgid="4003936141603549746">"ఖాళీ"</string>
     <string name="memory_usage_apps" msgid="5650192998273294098">"అనువర్తనాల ద్వారా ఉపయోగించబడిన మెమరీ"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
-      <item quantity="other">గత <xliff:g id="DURATION_1">%2$s</xliff:g>లో <xliff:g id="COUNT">%1$d</xliff:g> యాప్‌లు మెమరీని ఉపయోగించాయి</item>
-      <item quantity="one">గత <xliff:g id="DURATION_0">%2$s</xliff:g>లో 1 యాప్ మెమరీని ఉపయోగించింది</item>
+      <item quantity="other">గత <xliff:g id="DURATION_1">%2$s</xliff:g>లో <xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలు మెమరీని ఉపయోగించాయి</item>
+      <item quantity="one">గత <xliff:g id="DURATION_0">%2$s</xliff:g>లో 1 అనువర్తనం మెమరీని ఉపయోగించింది</item>
     </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="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_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_revoke_warning_dialog_summary" msgid="5518216907304930148">"ఈ యాప్ ద్వారా రూపొందించిన అన్ని అంతరాయం కలిగించవద్దు నిబంధనలు తీసివేయబడతాయి."</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>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"మీ బ్యాటరీ మరింత శీఘ్రంగా వినియోగించబడవచ్చు"</string>
@@ -3182,15 +3351,16 @@
     <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="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="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="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>
@@ -3199,14 +3369,12 @@
     <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_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_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>
@@ -3256,9 +3424,9 @@
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"స్క్రీన్‌షాట్ తీయడానికి అనుమతి లేదు"</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>
@@ -3298,8 +3466,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>
@@ -3315,21 +3482,21 @@
     <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="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_pin_before_startup_summary" msgid="6022831284097476933">"మీ డివైజ్‌ను ప్రారంభించడానికి పిన్ అవసరం. ఆఫ్‌లో ఉన్నప్పుడు, ఈ డివైజ్ కాల్‌లు, సందేశాలు, నోటిఫికేషన్‌లు లేదా అలారాలను స్వీకరించలేదు."</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>
@@ -3373,8 +3540,8 @@
     <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="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>
@@ -3384,7 +3551,6 @@
     <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_warning" msgid="9086859595338944882">"ప్రీమియం SMSతో మీకు డబ్బు ఖర్చు కావచ్చు, ఈ ఛార్జీ మీ క్యారియర్ బిల్లుల్లో విధించబడుతుంది. మీరు ఒక అనువర్తనానికి అనుమతిని అందిస్తే, ఆ అనువర్తనాన్ని ఉపయోగించి ప్రీమియం SMSను పంపగలరు."</string>
@@ -3449,28 +3615,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3519,8 +3712,8 @@
     <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="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="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>
@@ -3549,13 +3742,13 @@
       <item quantity="other">కెమెరా అనువర్తనాలు</item>
       <item quantity="one">కెమెరా అనువర్తనం</item>
     </plurals>
-    <string name="default_calendar_app_title" msgid="3545972964391065220">"క్యాలెండర్ యాప్"</string>
-    <string name="default_contacts_app_title" msgid="3497370557378660098">"కాంటాక్ట్‌ల యాప్"</string>
+    <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="other">ఇమెయిల్ క్లయింట్ అనువర్తనాలు</item>
       <item quantity="one">ఇమెయిల్ క్లయింట్ అనువర్తనం</item>
     </plurals>
-    <string name="default_map_app_title" msgid="7560143381633608567">"మ్యాప్ యాప్"</string>
+    <string name="default_map_app_title" msgid="7560143381633608567">"మ్యాప్ అనువర్తనం"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
       <item quantity="other">ఫోన్ అనువర్తనాలు</item>
       <item quantity="one">ఫోన్ అనువర్తనం</item>
@@ -3570,10 +3763,11 @@
     <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="clear_instant_app_data" msgid="2004222610585890909">"యాప్‌ను క్లియర్ చేయి"</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>
@@ -3584,8 +3778,13 @@
     <string name="storage_manager_indicator" msgid="1516810749625915020">"నిల్వ నిర్వాహికి: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ఆఫ్‌లో ఉంది"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ఆన్‌లో ఉంది"</string>
-    <string name="install_type_instant" msgid="3174425974536078647">"తక్షణ యాప్"</string>
+    <string name="install_type_instant" msgid="3174425974536078647">"తక్షణ అనువర్తనం"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"నిల్వ నిర్వాహికిని ఆఫ్ చేయాలా?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"చలన చిత్రం &amp; టీవీ అనువర్తనాలు"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"ఉపయోగించబడిన నిల్వ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"క్యారియర్ కేటాయింపు సమాచారం"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"క్యారియర్ కేటాయింపు సక్రియం చేయండి"</string>
+    <!-- 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-th/arrays.xml b/res/values-th/arrays.xml
index 3794809..2e88fe9 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"ดี"</item>
     <item msgid="8986346415847956850">"ยอดเยี่ยม"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ทุกครั้ง"</item>
-    <item msgid="844721238536786870">"เมื่อเสียบปลั๊กเท่านั้น"</item>
-    <item msgid="1986753720941888596">"ไม่ต้องเลย"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ทุกครั้ง"</item>
-    <item msgid="7433294150916905997">"เมื่อเสียบปลั๊กเท่านั้น"</item>
-    <item msgid="1390404486722375028">"ไม่เลย"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 วันที่ผ่านมา"</item>
     <item msgid="6600989128423965319">"ตั้งรอบการใช้..."</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ffebe94..61480d3 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -23,13 +23,13 @@
     <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="other">คุณกำลังจะได้เป็นนักพัฒนาซอฟต์แวร์ในอีก <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ขั้นตอน</item>
       <item quantity="one">คุณกำลังจะได้เป็นนักพัฒนาซอฟต์แวร์ในอีก <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ขั้นตอน</item>
     </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 +41,7 @@
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ที่จัดสรรแล้ว"</string>
     <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"จัดสรรแฮงเอาท์วิดีโอแล้ว"</string>
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"จัดสรรการโทรผ่าน Wi-Fi แล้ว"</string>
+    <string name="eab_provisioned_switch_string" msgid="3482272907448592975">"จัดสรร EAB/Presence แล้ว"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"กำลังส่งของวิทยุเครือข่ายมือถือ"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"ดูสมุดที่อยู่ของซิม"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ดูการจำกัดหมายเลขโทรออก"</string>
@@ -106,10 +107,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">"คุณไม่มีสิทธิ์ในการเปลี่ยนการตั้งค่าบลูทูธ"</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> ได้เมื่อเปิดการตั้งค่าบลูทูธ"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- 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) -->
@@ -329,7 +352,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 +377,55 @@
     <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">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าฟีเจอร์นี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 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>
+    <!-- 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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"เปลี่ยนรูปแบบการปลดล็อก"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"เปลี่ยน PIN สำหรับปลดล็อก"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"เปลี่ยนรหัสผ่านสำหรับปลดล็อก"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"ลองอีกครั้ง ความพยายามครั้งที่ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> จาก <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"การลองครั้งสุดท้าย"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"หากคุณป้อนรูปแบบการทำงานที่ไม่ถูกต้องในความพยายามครั้งนี้ ระบบจะนำโปรไฟล์งานของคุณและข้อมูลที่เชื่อมโยงออกจากอุปกรณ์นี้"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"หากคุณป้อน PIN การทำงานที่ไม่ถูกต้องในความพยายามครั้งนี้ ระบบจะนำโปรไฟล์งานของคุณและข้อมูลที่เชื่อมโยงออกจากอุปกรณ์นี้"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"หากคุณป้อนรหัสผ่านการทำงานที่ไม่ถูกต้องในความพยายามครั้งนี้ ระบบจะนำโปรไฟล์งานของคุณและข้อมูลที่เชื่อมโยงออกจากอุปกรณ์นี้"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ใช้ความพยายามหลายครัั้งเกินไป ระบบจะนำโปรไฟล์งานของคุณและข้อมูลที่เชื่อมโยงออกจากอุปกรณ์นี้"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ปิด"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"ลองอีกครั้ง ความพยายามครั้งที่ <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> จาก <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"ระบบจะลบข้อมูลของคุณ"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"หากคุณป้อนรูปแบบไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"หากคุณป้อน PIN ไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"หากคุณป้อนรหัสผ่านไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"หากคุณป้อนรูปแบบไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบผู้ใช้รายนี้"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"หากคุณป้อน PIN ไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบผู้ใช้รายนี้"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"หากคุณป้อนรหัสผ่านไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบผู้ใช้รายนี้"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"หากคุณป้อนรูปแบบไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบโปรไฟล์งานนี้และข้อมูลในโปรไฟล์"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"หากคุณป้อน PIN ไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบโปรไฟล์งานนี้และข้อมูลในโปรไฟล์"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"หากคุณป้อนรหัสผ่านไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบโปรไฟล์งานนี้และข้อมูลในโปรไฟล์"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"ใช้ความพยายามหลายครั้งเกินไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ใช้ความพยายามหลายครั้งเกินไป ระบบจะลบผู้ใช้รายนี้"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ใช้ความพยายามหลายครั้งเกินไป ระบบจะลบโปรไฟล์งานนี้และข้อมูลในโปรไฟล์"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ปิด"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ต้องมีอักขระอย่างน้อย <xliff:g id="COUNT">%d</xliff:g> ตัว"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN ต้องมีตัวเลขอย่างน้อย <xliff:g id="COUNT">%d</xliff:g> ตัว"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ดำเนินการต่อ"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -674,11 +738,11 @@
     <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_title" msgid="8850161330437693895">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"เปิด WiFi"</string>
-    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"WiFi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"การตั้งค่า WiFi"</string>
-    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"WiFi"</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">"กำลังเปิด WiFi…"</string>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"ชื่อเครือข่าย"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"ป้อน SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ความปลอดภัย"</string>
@@ -810,7 +873,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>
@@ -828,7 +890,7 @@
     <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_network_prefix_length" msgid="3028785234245085998">"ความยาวของหมายเลขเครือข่าย"</string>
     <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WiFi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ข้อมูลอุปกรณ์"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"จำการเชื่อมต่อนี้"</string>
@@ -847,9 +909,28 @@
     <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>
+    <!-- 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_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">"กำลังเปิดฮอตสปอต…"</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 +977,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>
@@ -979,24 +1061,34 @@
     <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>
+    <!-- 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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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">"การตั้งค่าการล็อกซิมการ์ด"</string>
@@ -1103,7 +1206,7 @@
     <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>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"ลบการ์ด SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ลบข้อมูลทั้งหมดในที่จัดเก็บข้อมูล USB ภายใน เช่น เพลงหรือรูปภาพ"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ลบข้อมูลทั้งหมดในการ์ด SD เช่น เพลงหรือรูปภาพ"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"ลบข้อมูลใน eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"ลบซิมอิเล็กทรอนิกส์ทั้งหมดในโทรศัพท์ การดำเนินการนี้ไม่ได้เป็นการยกเลิกแพ็กเกจอินเทอร์เน็ตของคุณ"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"ลบซิมอิเล็กทรอนิกส์ทั้งหมดในแท็บเล็ต การดำเนินการนี้ไม่ได้เป็นการยกเลิกแพ็กเกจอินเทอร์เน็ตของคุณ"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"รีเซ็ตแท็บเล็ต"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"รีเซ็ตโทรศัพท์"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"หากลบข้อมูลส่วนบุคคลและแอ⁠⁠ปที่ดาวน์โหลดทั้งหมด คุณจะไม่สามารถยกเลิกการทำงานนี้ได้"</string>
@@ -1324,29 +1431,23 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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="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> เป็นแอป SMS ของคุณแทน <xliff:g id="CURRENT_APP">%2$s</xliff:g> ไหม"</string>
@@ -1376,7 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1539,7 +1646,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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"บนการ์ด SD"</string>
+    <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>
@@ -1608,7 +1716,7 @@
     <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">"Store"</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_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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ความช่วยเหลือในการป้อนข้อมูล"</string>
@@ -1764,7 +1877,7 @@
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"บริการที่ดาวน์โหลด"</string>
     <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="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>
@@ -1873,6 +1986,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>
@@ -1925,7 +2042,7 @@
     <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">"WiFi"</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) -->
@@ -1939,10 +2056,50 @@
     <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_wifi" msgid="1135085252964054957">"WiFi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"บลูทูธ"</string>
     <string name="power_cell" msgid="3392999761958982492">"สแตนด์บายเครือข่ายมือถือ"</string>
     <string name="power_phone" msgid="5392641106474567277">"การโทรด้วยเสียง"</string>
@@ -1953,7 +2110,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">"CPU รวม"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ส่วนหน้าของ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ทำงานตลอดเวลา"</string>
@@ -2005,12 +2163,14 @@
     <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>
+    <!-- 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="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="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>
@@ -2103,7 +2263,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">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"WiFi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"บลูทูธ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"ตำแหน่ง"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ซิงค์"</string>
@@ -2313,7 +2473,7 @@
     <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">"ตั้งค่าขีดจำกัดข้อมูล WiFi"</string>
-    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"WiFi"</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>
@@ -2654,16 +2814,19 @@
       <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>
     <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>
@@ -2709,6 +2872,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">"ตั้งค่าแท็ก NFC สำหรับ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"แตะแท็กเพื่อเขียน..."</string>
@@ -2731,7 +2900,7 @@
     <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>
@@ -2751,7 +2920,7 @@
       <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_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>
@@ -2778,12 +2947,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_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>
@@ -2827,14 +2996,12 @@
     <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_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_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="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">"การแสดงผลหลายแหล่งพร้อมกัน การแสดงผล"</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="manage_zen_access_title" msgid="2611116122628520522">"การเข้าถึง \"ห้ามรบกวน\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ไม่มีแอปที่ติดตั้งใดๆ ส่งคำขอสิทธิ์เข้าถึง \"ห้ามรบกวน\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
@@ -2859,9 +3026,9 @@
     <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="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_row_banned" msgid="5983655258784814773">"ถูกบล็อก"</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -2996,7 +3158,7 @@
     <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="SIZE">%1$s</xliff:g> ใน<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"ใช้ไป <xliff:g id="SIZE">%1$s</xliff:g> ใน <xliff:g id="STORAGE_TYPE">%2$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>
@@ -3039,12 +3201,12 @@
     <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="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">"แตะที่ใดก็ได้บนหน้าจอ 2 ครั้งเพื่อปลุกอุปกรณ์"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"ลิงก์สำหรับเปิด"</string>
@@ -3095,6 +3257,12 @@
     <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>
+    <!-- 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>
@@ -3187,8 +3355,9 @@
     <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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"อนุญาตจากแหล่งที่มานี้"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"บิด 2 ครั้งเพื่อเปิดกล้อง"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"เปิดแอปกล้องถ่ายรูปโดยบิดข้อมือ 2 ครั้ง"</string>
@@ -3275,7 +3442,7 @@
     <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="suggestion_remove" msgid="904627293892092439">"นำออก"</string>
@@ -3288,7 +3455,7 @@
     <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="wifi" msgid="1081550856200013637">"WiFi"</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">"ข้อมูล Wi-Fi <xliff:g id="AMOUNT">^1</xliff:g>"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">1 แอปได้รับอนุญาตให้ใช้อินเทอร์เน็ตได้ไม่จำกัดเมื่อเปิดโปรแกรมประหยัดอินเทอร์เน็ต</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"การประหยัดอินเทอร์เน็ต"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"เข้าถึงข้อมูลได้ไม่จำกัด"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"เข้าถึงข้อมูลได้ไม่จำกัด"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ปิดใช้ข้อมูลแบ็กกราวด์"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"เปิด"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ปิด"</string>
@@ -3382,7 +3548,6 @@
     <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_warning" msgid="9086859595338944882">"SMS แบบพรีเมียมอาจมีค่าใช้จ่ายและจะเพิ่มเข้าไปในใบเรียกเก็บเงินจากผู้ให้บริการ หากคุณให้สิทธิ์แอปหนึ่งๆ คุณจะใช้แอปนั้นส่ง SMS แบบพรีเมียมได้"</string>
@@ -3447,28 +3612,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">"หากต้องการเปิดกล้องอย่างรวดเร็ว ให้กดปุ่มเปิดปิด 2 ครั้ง ใช้ได้กับหน้าจอทุกรุ่น"</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">"แตะ 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>
+    <!-- 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 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>
@@ -3572,6 +3764,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>
@@ -3585,5 +3778,10 @@
     <string name="install_type_instant" msgid="3174425974536078647">"Instant App"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ปิดตัวจัดการพื้นที่เก็บข้อมูลใช่ไหม"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"แอป Movie &amp; TV"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"พื้นที่ที่ใช้ไป"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ข้อมูลการจัดสรรผู้ให้บริการ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ทริกเกอร์การจัดสรรผู้ให้บริการ"</string>
+    <!-- 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-tl/arrays.xml b/res/values-tl/arrays.xml
index 0b9b2f0..23b0c1a 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Malakas"</item>
     <item msgid="8986346415847956850">"Napakalakas"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Palagi"</item>
-    <item msgid="844721238536786870">"Kapag naka-plug in lamang"</item>
-    <item msgid="1986753720941888596">"Hindi Kailanman"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Palagi"</item>
-    <item msgid="7433294150916905997">"Kapag naka-plug in lamang"</item>
-    <item msgid="1390404486722375028">"Hindi Kailanman"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Nakalipas na 30 araw"</item>
     <item msgid="6600989128423965319">"Itakda ang usage cycle..."</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 98918e2..9dfa066 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Tanggihan"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Isara"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Lumipat"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Hindi Kilala"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> hakbang na lang, magiging developer ka na.</item>
       <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> na hakbang na lang, magiging developer ka na.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Wala kang pahintulot na palitan ang mga setting ng Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ang iyong mga device"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Petsa at oras"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Pumili ng time zone"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Mga Account"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasyon"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Mga Account"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Seguridad at Lokasyon"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Seguridad at lokasyon"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Pag-encrypt at mga kredensyal"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Naka-encrypt ang telepono"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Device ay naka-encrypt"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Baguhin ang naka-unlock na pattern"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Palitan ang PIN na pang-unlock"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Baguhin ang naka-unlock na password"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Subukang muli. Pagsubok <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ng <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Huling pagsubok"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Kung maling pattern sa trabaho ang mailalagay mo sa pagsubok na ito, maaalis sa device na ito ang iyong profile sa trabaho at ang nauugnay na data dito."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Kung maling PIN sa trabaho ang mailalagay mo sa pagsubok na ito, maaalis sa device na ito ang iyong profile sa trabaho at ang nauugnay na data dito."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Kung maling password sa trabaho ang mailalagay mo sa pagsubok na ito, maaalis sa device na ito ang iyong profile sa trabaho at ang nauugnay na data dito."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Masyadong maraming maling pagsubok. Maaalis sa device na ito ang iyong profile sa trabaho at ang nauugnay na data dito."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"I-dismiss"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Subukang muli. Pagsubok <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> ng <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Made-delete ang iyong data"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Kung maling pattern ang mailalagay mo sa susunod na pagsubok, made-delete ang data ng mga device na ito"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Kung maling PIN ang mailalagay mo sa susunod na pagsubok, made-delete ang data ng mga device na ito"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Kung maling password ang mailalagay mo sa susunod na pagsubok, made-delete ang data ng mga device na ito"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Kung maling pattern ang mailalagay mo sa susunod na pagsubok, made-delete ang user na ito"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Kung maling PIN ang mailalagay mo sa susunod na pagsubok, made-delete ang user na ito"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Kung maling password ang mailalagay mo sa susunod na pagsubok, made-delete ang user na ito"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Kung maling pattern ang mailalagay mo sa susunod na pagsubok, made-delete ang iyong profile sa trabaho at ang data nito"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Kung maling PIN ang mailalagay mo sa susunod na pagsubok, made-delete ang iyong profile sa trabaho at ang data nito"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Kung maling password ang mailalagay mo sa susunod na pagsubok, made-delete ang iyong profile sa trabaho at ang data nito"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Masyadong maraming maling pagsubok. Made-delete ang data ng mga device na ito."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Masyadong maraming maling pagsubok. Made-delete ang user na ito."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Masyadong maraming maling pagsubok. Made-delete ang profile sa trabaho na ito at ang data nito."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"I-dismiss"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Dapat ay binubuo ng kahit <xliff:g id="COUNT">%d</xliff:g> (na) character lang"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Dapat ay binubuo ng kahit <xliff:g id="COUNT">%d</xliff:g> (na) digit lang ang PIN"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Magpatuloy"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Hindi sinusuportahan ang setting ng seguridad ng wireless na router (TKIP)"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pagkabigo sa pagpapatotoo. Pakisubukang muli."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Natunton ang isa pang sesyon ng WPS. Pakisubukang muli sa loob ng ilang minuto."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Nadiskonekta ang Wi‑Fi. Nakansela ang pag-set up ng WPS."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Pangalan ng network"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Ilagay ang SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Oras ng pagsisimula"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Oras ng pagtatapos"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Naka-on / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Paganahin ang screen kapag nakatanggap ka ng mga notification"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Palaging naka-on"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Ipakita ang oras, mga icon ng notification, at iba pang impormasyon"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Palakihin o paliitin ang text"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setting ng lock ng SIM card"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Burahin ang SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Burahin ang lahat ng data sa panloob na USB storage, gaya ng musika o mga larawan"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Burahin ang lahat ng data sa SD card, gaya ng musika o mga larawan"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Burahin ang mga eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Burahin ang lahat ng eSIM sa telepono. Hindi nito kakanselahin ang iyong mobile service plan."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Burahin ang lahat ng eSIM sa tablet. Hindi nito kakanselahin ang iyong mobile service plan."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"I-reset ang tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"I-reset ang telepono"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Burahin ang lahat ng iyong personal na impormasyon at na-download na app? Hindi mo maaaring i-undo ang pagkilos na ito!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Tumatakbo"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Storage na USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sa SD card"</string>
+    <string name="disabled" msgid="9206776641295849915">"Naka-disable"</string>
     <string name="not_installed" msgid="2797554494953450291">"Hindi naka-install para sa user na ito"</string>
     <string name="installed" msgid="3070865169422600098">"Naka-install"</string>
     <string name="no_applications" msgid="7336588977497084921">"Walang app."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,10 @@
       <item quantity="one">May <xliff:g id="COUNT">%1$d</xliff:g> serbisyo ng pag-print na naka-on</item>
       <item quantity="other">May <xliff:g id="COUNT">%1$d</xliff:g> na serbisyo ng pag-print na naka-on</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> pag-print</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> na pag-print</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Mga serbisyo ng pag-print"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Walang mga naka-install na serbisyo"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Walang mga natagpuang printer"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Screen"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Mga default na app"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Mga wika, oras, backup, update"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mga Setting"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Hanapin sa mga setting"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Hanapin sa mga setting"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Mga setting ng paghahanap"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Mga setting ng paghahanap"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, koneksyon sa network"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"text message, pag-text, mga mensahe, pagmemensahe"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellular, mobile, cell carrier, wireless, data, 4g,3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"galaw"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"magbayad, mag-tap, mga pagbabayad"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup, i-back up"</string>
+    <!-- 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">"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>
@@ -2727,7 +2896,7 @@
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume ng pag-ring"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume ng notification"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"Default na notification sound"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Default, tunog ng notification"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Tunog mula sa app"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"Default na tunog ng notification"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Default na tunog ng alarm"</string>
@@ -2760,7 +2929,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Mga alarm lang"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Ganap na katahimikan"</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">"I-block ang visual na abala"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"I-block ang mga visual na abala"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Mga tunog sa profile sa trabaho"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Gamitin tunog sa personal na profile"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Pareho ang mga tunog para sa personal na profile at profile sa trabaho"</string>
@@ -2774,7 +2943,7 @@
     <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"Magdagdag ng custom na tunog?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"Maglalagay ng kopya ng file na ito sa folder na <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Mga Ringtone"</string>
-    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Iba pang tunog at pag-vibrate"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Iba pang mga tunog at pag-vibrate"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Mga Notification"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Mga notification sa trabaho"</string>
@@ -2833,8 +3002,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>
@@ -2879,7 +3046,7 @@
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ginagamit na ang pangalan ng panuntunan"</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"Magdagdag pa"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"I-delete ang panuntunan"</string>
-    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Piliin ang uri ng panuntunan"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Pumili ng uri ng panuntunan"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"I-delete ang panuntunang \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"I-delete"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Uri ng panuntunan"</string>
@@ -2965,11 +3132,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ang profile sa trabahong ito ay pinapamahalaan ng:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Pinapamahalaan ng <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Pang-eksperimento)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Pag-rotate ng device"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"ikutin ang mga content ng screen"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Manatili sa portrait na view"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Manatili sa landscape na view"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manatili sa kasalukuyang oryentasyon"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Secure na pagsisimula"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Magpatuloy"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong PIN bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm. \n\nNakakatulong ito na protektahan ang data ng mga nawawala o ninakaw na device. Humingi ng PIN upang simulan ang device mo?"</string>
@@ -2977,7 +3139,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong password bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm. \n\nNakakatulong ito na protektahan ang data ng mga nawawala o ninakaw na device. Humingi ng password upang simulan ang device mo?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng PIN mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng PIN upang simulan ang iyong device?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng pattern mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng pattern upang simulan ang iyong device?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng password mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng password upang simulan ang iyong device&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Bukod pa sa paggamit ng iyong fingerprint sa pag-unlock ng device mo, maaari mong higit pang protektahan ang device na ito sa pamamagitan ng paghingi ng iyong password bago ito magsimula. Hangga\'t hindi nakakapagsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito sa pagprotekta ng data sa mga nawawala o nanakaw na device. Humingi ng password sa pagsisimula ng iyong device?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Oo"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Huwag"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Hingin ang PIN?"</string>
@@ -3093,8 +3255,14 @@
     <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">"Pag-optimize ng baterya"</string>
     <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="show_all_apps" msgid="1512506948197818534">"Ipakita ang kumpletong paggamit ng device"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Ipakita ang paggamit ng app"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Malakas gumamit ng baterya"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="one">Hindi gumagana nang maayos ang <xliff:g id="NUMBER">%2$d</xliff:g> app</item>
+      <item quantity="other">Hindi gumagana nang maayos ang <xliff:g id="NUMBER">%2$d</xliff:g> na app</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Mag-install ng mga hindi alam na app"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Pahintulot sa pagbago ng app sa setting ng system"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Payagan ang pagbago sa mga setting ng system"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Nagbibigay-daan ang pahintulot na ito sa isang app na baguhin ang mga setting ng system."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Oo"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Hindi"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Payagan mula sa pinagmulang ito"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dobleng pag-twist para sa camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Buksan ang camera app sa pamamagitan ng pag-twist sa iyong kamay nang dalawang beses"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Awtomatiko"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manu-mano"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Magbakante ng espasyo ngayon"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Mga Galaw"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Mga shortcut ng galaw"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Mga mabilisang galaw upang makontrol ang iyong telepono"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Mga mabilisang galaw upang kontrolin ang iyong tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Mga mabilisang galaw upang kontrolin ang iyong device"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Pumunta sa camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Upang mabuksan kaagad ang camera, pindutin ang power button nang dalawang beses. Gumagana ito sa anumang screen."</string>
+    <!-- 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">"Lumipat ng camera"</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">"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_pickup_title" product="default" msgid="818688002837687268">"Hawakan para i-check ang phone"</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">"Kunin upang suriin ang telepono"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Kunin upang suriin ang tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Kunin upang suriin ang device"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Upang makita kaagad ang iyong mga notification, kunin ang telepono mo."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Upang makita kaagad ang iyong mga notification, kunin ang tablet mo."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Upang makita kaagad ang iyong mga notification, kunin ang device mo."</string>
+    <!-- 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">"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>
+    <!-- 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">"Itaas upang buksan ang camera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Upang awtomatikong buksan ang camera, iangat ang iyong telepono at iposisyon ito para sa pagkuha ng larawan (landscape o portrait). Gagana kapag naka-sleep o naka-lock ang iyong telepono."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Kumuha ng larawan kapag naka-sleep o naka-lock ang telepono"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Galaw para sa tulong"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Pagkasensitibo"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-tr/arrays.xml b/res/values-tr/arrays.xml
index 482d43a..b84b724 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"İyi"</item>
     <item msgid="8986346415847956850">"Mükemmel"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Her zaman"</item>
-    <item msgid="844721238536786870">"Yalnızca prize takılıyken"</item>
-    <item msgid="1986753720941888596">"Hiçbir zaman"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Her zaman"</item>
-    <item msgid="7433294150916905997">"Yalnızca prize takılıyken"</item>
-    <item msgid="1390404486722375028">"Hiçbir zaman"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Son 30 gün"</item>
     <item msgid="6600989128423965319">"Kullanım döngüsünü ayarla..."</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8be0414..4b8e9ab 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Reddet"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Kapat"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Değiştir"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Geliştirici olmanıza <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> adım kaldı.</item>
       <item quantity="one">Geliştirici olmanıza <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> adım kaldı.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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 ayarlarını değiştirmek için izniniz yok."</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>, Bluetooth ayarları açıkken yakındaki cihazlar tarafından görülebilir."</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> 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>
@@ -118,10 +135,11 @@
     <string name="bluetooth_device" msgid="5291950341750186887">"Adsız Bluetooth cihazı"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Arıyor"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Yakınlarda Bluetooth cihazı bulunamadı."</string>
-    <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_ticker" msgid="4726721390078512173">"Bluetooth eşleşme isteği"</string>
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Eşleşme isteği"</string>
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşlemek için dokunun."</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Alınan dosyaları göster"</string>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Cihazlarınız"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"İ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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Kilit açma desenini değiştir"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilit açma PIN\'ini değiştir"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Tekrar deneyin. Toplam <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> denemeden <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> hakkınız kaldı."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Son deneme"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"İş profili desenini bu denemede yanlış girerseniz, iş profiliniz ve ilişkilendirilen veriler bu cihazdan kaldırılır."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"İş profili PIN\'i bu denemede yanlış girerseniz, iş profiliniz ve ilişkilendirilen veriler bu cihazdan kaldırılır."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"İş profili şifresini bu denemede yanlış girerseniz, iş profiliniz ve ilişkilendirilen veriler bu cihazdan kaldırılır."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Çok fazla hatalı denemede bulundunuz. İş profiliniz ve ilişkilendirilen veriler bu cihazdan kaldırılacak."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Kapat"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Tekrar deneyin. Toplam <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> denemeden <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> hakkınız kaldı."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Verileriniz silinecek"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Bir sonraki denemenizde yanlış desen girerseniz bu cihazın verileri silinecek"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Bir sonraki denemenizde yanlış PIN girerseniz bu cihazın verileri silinecek"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Bir sonraki denemenizde yanlış şifre girerseniz bu cihazın verileri silinecek"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Bir sonraki denemenizde yanlış desen girerseniz bu kullanıcı silinecek"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Bir sonraki denemenizde yanlış PIN girerseniz bu kullanıcı silinecek"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Bir sonraki denemenizde yanlış şifre girerseniz bu kullanıcı silinecek"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Bir sonraki denemenizde yanlış desen girerseniz iş profiliniz ve verileri silinecek"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Bir sonraki denemenizde yanlış PIN girerseniz iş profiliniz ve verileri silinecek"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Bir sonraki denemenizde yanlış şifre girerseniz iş profiliniz ve verileri silinecek"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Çok fazla sayıda hatalı deneme yapıldı. Bu cihazın verileri silinecek."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Çok fazla sayıda hatalı deneme yapıldı. Bu kullanıcı silinecek."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Çok fazla sayıda hatalı denemede yapıldı. İş profiliniz ve verileri silinecek."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Kapat"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"En az <xliff:g id="COUNT">%d</xliff:g> karakter olmalıdır"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN en az <xliff:g id="COUNT">%d</xliff:g> basamaklı olmalıdır"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Devam Et"</string>
@@ -594,9 +642,9 @@
     <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"18 basamaklı olmalıdır"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Bu PIN\'i diğer cihazda da yazmanız gerekebilir."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Bu parolayı diğer cihazda da girmeniz gerekebilir."</string>
-    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Şu cihazla eşlemek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu parolanın göründüğünden emin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Şu cihazla eşleştirmek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu parolanın göründüğünden emin olun:&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">"Kaynak:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bu cihaz ile eşlensin mi?"</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> ile eşlemek için cihaz üzerinde <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> yazarak Return veya Enter tuşuna basın."</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> ile eşleştirmek için cihaz üzerinde <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> yazarak Return veya Enter tuşuna basın."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> adlı cihazın kişilerime ve çağrı geçmişime erişmesine izin ver"</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> adlı cihaza bağlanılamadı."</string>
@@ -609,7 +657,7 @@
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"İnternet bağlantısı"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"Klavye"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"Kişiler ve çağrı geçmişi"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"Bu cihaz ile eşlensin mi?"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"Bu cihaz ile eşleştirilsin mi?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Telefon rehberi paylaşılsın mı?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, rehberinize ve çağrı geçmişinize erişmek istiyor."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, Bluetooth ile eşlenmek istiyor. Bağlantı kurulduğunda, kişilerinize ve çağrı geçmişinize erişebilecek."</string>
@@ -618,14 +666,30 @@
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Kullanılabilir cihaz yok"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Bağlan"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Bağlantıyı kes"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Eşle ve bağlan"</string>
-    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Eşlemeyi bitir"</string>
-    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Bağlantıyı kes ve eşlemeyi bitir"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Eşleştir ve bağlan"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Eşleşmeyi bitir"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Bağlantıyı kes ve eşleşmeyi bitir"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Seçenekler…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Gelişmiş"</string>
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Kablosuz yönlendirici güvenlik ayarı (TKIP) desteklenmiyor"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Kimlik doğrulama başarısız oldu. Lütfen tekrar deneyin."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Başka bir WPS oturumu saptandı. Lütfen birkaç dakika sonra tekrar deneyin."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Kablosuz bağlantı kesildi. WPS kurulumu iptal edildi."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Ağ adı"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID\'yi girin"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Güvenlik"</string>
@@ -783,7 +846,7 @@
     <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>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ağ şifrenizi girin"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Konum bilgisinin doğruluğunu iyileştirmek ve diğer amaçlar için, <xliff:g id="APP_NAME">%1$s</xliff:g> Kablosuz bağlantı kapalı olduğunda bile ağ tarama işlevini açmak istiyor.\n\nTarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Konum bilgisinin doğruluğunu artırmak ve diğer amaçlar için, <xliff:g id="APP_NAME">%1$s</xliff:g> Kablosuz bağlantı kapalı olduğunda bile ağ tarama işlevini açmak istiyor.\n\nTarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Bu özelliği kapatmak için taşma menüsünde Gelişmiş seçeneğine gidin."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İzin ver"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Reddet"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Başlangıç zamanı"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Bitiş zamanı"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Açık / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Bildirim geldiğinde ekranı uyandır"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Her zaman açık"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Saati, bildirim simgelerini ve diğer bilgileri göster"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Metni daha büyük veya daha küçük yapın"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
@@ -1273,6 +1376,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>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD kartı sil"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Dahili USB bellekteki müzik veya fotoğraf gibi tüm verileri sil"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD kartındaki müzik ve fotoğraf gibi tüm verileri sil"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM\'leri sil"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Telefondaki tüm eSIM\'leri siler. Bu işlem, mobil hizmet planınızı iptal etmez."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Tabletteki tüm eSIM\'leri siler. Bu işlem, mobil hizmet planınızı iptal etmez."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tableti sıfırla"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefonu sıfırla"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Tüm kişisel bilgileriniz ve indirdiğiniz uygulamalar silinsin mi? Bu işlemi geri alamazsınız!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Çalışanlar"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB bellek"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartta"</string>
+    <string name="disabled" msgid="9206776641295849915">"Devre dışı"</string>
     <string name="not_installed" msgid="2797554494953450291">"Bu kullanıcı için yüklü değil"</string>
     <string name="installed" msgid="3070865169422600098">"Yüklendi"</string>
     <string name="no_applications" msgid="7336588977497084921">"Uygulama yok."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1771,7 +1884,7 @@
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Üç kez dokunarak büyütme"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Düğmeyle büyütme"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Düğmeyle ve üç kez dokunarak büyütme"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Ekranı yakınlaştırın"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Ekranı yakınlaştır"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Yakınlaştırmak için 3 defa dokunun"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Yakınlaştırmak için bir düğmeye dokunun"</string>
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Yakınlaştırmak için"</b>" ekrana 3 kez hızlıca dokunun.\n"<ul><li>"Kaydırmak için 2 veya daha fazla parmağınızı sürükleyin"</li>\n<li>"Yakınlaştırmayı ayarlamak için 2 veya daha fazla parmağınızı birbirine yaklaştırın"</li></ul>\n\n<b>"Geçici olarak büyütmek için"</b>" ekrana 3 kez hızlıca dokunun ve üçüncü dokunuşunuzda parmağınızı basılı tutun.\n"<ul><li>"Ekranda gezinmek için parmağınızı sürükleyin"</li>\n<li>"Uzaklaştırmak için parmağınızı kaldırın"</li></ul>\n\n"Klavyede veya gezinme çubuğundayken yakınlaştırma yapamazsınız."</string>
@@ -1873,6 +1986,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 +2056,46 @@
     <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>
+    <!-- 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">"El feneri"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2146,7 +2306,7 @@
     <string name="usage_access_title" msgid="332333405495457839">"Erişimi olan uygulamalar"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Acil sesi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Acil çağrı yapıldığında nasıl işlev göreceğini ayarlayın"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"Yedekleme"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"Yedekle"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Yedekleme ve geri yükleme"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Kişisel veriler"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Verilerimi yedekle"</string>
@@ -2571,7 +2731,7 @@
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Cana ve mala karşı aşırı tehditlerle ilgili uyarıları alın"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ciddi tehditler"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"Cana ve mala karşı ciddi tehditlerle ilgili uyarıları alın"</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER uyarıları"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"SARI uyarılar"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Çocuk kaçırma olaylarıyla ilgili bültenleri alın"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Tekrarla"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"Çağrı Yöneticisini Etkinleştir"</string>
@@ -2596,7 +2756,7 @@
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Kablosuz ve Mobil"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Kablosuz ve Mobil ayarlarını değiştirmeye izin ver"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth eşlemelerini ve ayarlarını değiştirmeye izin ver"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth eşleşmelerini ve ayarlarını değiştirmeye izin ver"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Bu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, başka bir NFC cihazına dokunduğunda veri alışverişi yapmalarına izin verin"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Tablet başka cihaza dokunduğunda veri alışverişine izin ver"</string>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Varsayılan uygulamalar"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Diller, saat, yedek, güncellemeler"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Ayarlarda arayın"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Ayarlarda arayın"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Arama ayarları"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Arama ayarları"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"kablosuz, kablosuz, ağ bağlantısı"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"kısa mesaj, kısa mesaj gönderme, mesajlar, mesajlaşma"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"hücresel, mobil, cep telefonu operatörü, kablosuz, veri, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"hareket"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ödeme, dokunma, ödemeler"</string>
     <string name="keywords_backup" msgid="470070289135403022">"yedek, yedekleme"</string>
+    <!-- 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">"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>
@@ -2827,14 +2996,12 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Cihaz VR modundayken"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Bulanıklığı azalt (önerilir)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Titremeyi azalt"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Pencere içinde pencere"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Yüklü uygulamalardan hiçbiri pencere içinde pencere özelliğini desteklemiyor"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Ekran içinde ekran"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Yüklü uygulamalardan hiçbiri ekran içinde ekran özelliğini desteklemiyor"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip ekran içinde"</string>
-    <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="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Ekran içinde ekran"</string>
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Ekran içinde ekran özelliğine izin ver"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Bu uygulamanın, uygulama açıkken veya uygulamadan çıktıktan sonra (örneğin, video izlemeye devam etmek için) ekran içinde ekran penceresi oluşturmasına izin verin. Bu pencere, kullandığınız diğer uygulamaların üzerinde gösterilir."</string>
     <string name="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>
@@ -2862,7 +3029,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"Bildirim noktasına izin ver"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildirim noktasını göster"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Rahatsız Etmeyin ayarını geçersiz kıl"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Rahatsız Etmeyin\" seçeneği \"Yalnızca Öncelikli\" olarak ayarlıyken bu bildirimlerin gösterilmesine izin ver"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Rahatsız Etmeyin seçeneği \"Yalnızca Öncelikli\" olarak ayarlıyken, bu bildirimlerin kesmeye devam etmesine izin ver"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Kilit ekranında"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Engellendi"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Öncelik"</string>
@@ -2877,7 +3044,7 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Kural adı"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Kural adı girin"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Kural adı zaten kullanılıyor"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Daha fazla ekle"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Daha fazla fotoğraf ekle"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Kuralı sil"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Kural türü seçin"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"\"<xliff:g id="RULE">%1$s</xliff:g>\" adlı kural silinsin mi?"</string>
@@ -2965,11 +3132,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 +3139,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>
@@ -2991,12 +3153,12 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI göreli bilgileri"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Yuva<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Varsayılan olarak aç"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Bağlantıları açma"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Açılış bağlantıları"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Desteklenen bağlantıları aç"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Sormadan aç"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Desteklenen bağlantılar"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Diğer varsayılanlar"</string>
-    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="SIZE">%1$s</xliff:g> kullanılıyor (<xliff:g id="STORAGE_TYPE">%2$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> kullanılıyor"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"Dahili depolama"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"Harici depolama"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"Uygulama veri kullanımı"</string>
@@ -3047,7 +3209,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> kullanan uygulamalar"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Dokunarak uyandır"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Cihazı uyandırmak için ekranda herhangi bir yere iki kez dokunun"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Bağlantıları açma"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Açılış bağlantıları"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Desteklenen bağlantıları açma"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> alanını açan"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> alan adını ve diğer URL\'leri açın"</string>
@@ -3095,6 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Bilinmeyen uygulamaları yükle"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Uygulamanın, sistem ayarlarını değiştirme izni"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Sistem ayarlarını değiştirmeye izin ver"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Bu izin, bir uygulanın sistem ayarlarını değiştirmesine olanak sağlar."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Evet"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Hayır"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Bu kaynaktan izin verin"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera için iki kez bükün"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Bileğinizi iki kez bükerek kamera uygulamasını açın"</string>
@@ -3233,8 +3400,8 @@
     <string name="notification_summary_none" msgid="4586376436702610">"Tüm uygulamalar için açık"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> uygulama yüklü"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 uygulama yüklendi"</string>
-    <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> kullanılıyor - <xliff:g id="FREE_SPACE">%2$s</xliff:g> boş"</string>
-    <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Dahili depolama alanı: <xliff:g id="PERCENTAGE">%1$s</xliff:g> kullanılıyor - <xliff:g id="FREE_SPACE">%2$s</xliff:g> boş"</string>
+    <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> kullanıldı - <xliff:g id="FREE_SPACE">%2$s</xliff:g> depolama alanı boş"</string>
+    <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Dahili depolama alanı: <xliff:g id="PERCENTAGE">%1$s</xliff:g> kullanıldı - <xliff:g id="FREE_SPACE">%2$s</xliff:g> boş"</string>
     <string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> süreyle işlem yapılmadığında uyku moduna geç"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"Duvar kağıdı, uyku, yazı tipi boyutu"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"10 dakika işlem yapılmadığında uyku moduna geç"</string>
@@ -3296,8 +3463,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>
@@ -3317,7 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatik"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Şimdi yer boşalt"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Hareketler"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Hareket kısayolları"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonunuzu kontrol etmek için hızlı hareketler"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Tabletinizi kontrol etmek için pratik hareketler"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Cihazınızı kontrol etmek için pratik hareketler"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kamerayı hızlı açma"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamerayı çabuk açmak için güç düğmesine iki kez dokunun. Tüm ekranlarda çalışır."</string>
+    <!-- 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">"Kamerayı çevir"</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">"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_pickup_title" product="default" msgid="818688002837687268">"Bakmak için telefonu kaldır"</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">"Telefonu kontrol etmek için kaldırın"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tableti kontrol etmek için kaldırın"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Cihazı kontrol etmek için kaldırın"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Bildirimlerinizi hızlıca kontrol etmek için telefonunuzu elinize alın."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Bildirimlerinizi hızlıca kontrol etmek için tabletinizi elinize alın."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Bildirimlerinizi hızlıca kontrol etmek için cihazınızı elinize alın."</string>
+    <!-- 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">"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>
+    <!-- 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">"Kamerayı açmak için telefonu kaldırın"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kamerayı otomatik olarak açmak için telefonunuzu fotoğraf çekme pozisyonunda (yatay veya dikey) olacak şekilde kaldırın."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Telefonunuz uyku modundayken veya kilitliyken fotoğraf çekin"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Asistan hareketi"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Hassasiyet"</string>
@@ -3487,7 +3679,7 @@
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Depolama alanınız artık depolama yöneticisi tarafından yönetiliyor"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> adlı kullanıcının hesapları"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"Yapılandırma"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"Verileri otomatik senkronize et"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"Verileri otomatik olarak senkronize et"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Kişisel verileri otomatik olarak senkronize et"</string>
     <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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-uk/arrays.xml b/res/values-uk/arrays.xml
index 4d706ff..20f0141 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Добрий"</item>
     <item msgid="8986346415847956850">"Відмінний"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Завжди"</item>
-    <item msgid="844721238536786870">"Лише в підключеному стані"</item>
-    <item msgid="1986753720941888596">"Ніколи"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Завжди"</item>
-    <item msgid="7433294150916905997">"Лише в підключеному стані"</item>
-    <item msgid="1390404486722375028">"Ніколи"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Останні 30 днів"</item>
     <item msgid="6600989128423965319">"Цикл використання даних…"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bd86ca9..dfdd108 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/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">"З’єднання"</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">"Пристрої поблизу можуть знайти <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, якщо відкрито налаштування Bluetooth."</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">"Торкніться, щоб підключитися до пристрою <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) -->
@@ -333,7 +356,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 +383,55 @@
     <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>
@@ -455,6 +493,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 +565,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Змінити ключ розблокув."</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змінити PIN розблок."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змінити пароль розблок."</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Спробуйте ще. Спроба <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> із <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Остання спроба"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Якщо цього разу ви введете неправильний ключ, ваш робочий профіль і зв’язані з ним дані буде видалено з цього пристрою."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Якщо цього разу ви введете неправильний PIN-код, ваш робочий профіль і зв’язані з ним дані буде видалено з цього пристрою."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Якщо цього разу ви введете неправильний пароль, ваш робочий профіль і зв’язані з ним дані буде видалено з цього пристрою."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Забагато невдалих спроб. Ваш робочий профіль і зв’язані з ним дані буде видалено з цього пристрою."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Відхилити"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Спробуйте ще. Спроба <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> із <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Ваші дані буде видалено"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Якщо наступного разу ви введете неправильний ключ, дані на цьому пристрої буде видалено"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Якщо наступного разу ви введете неправильний PIN-код, дані на цьому пристрої буде видалено"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Якщо наступного разу ви введете неправильний пароль, дані на цьому пристрої буде видалено"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Якщо наступного разу ви введете неправильний ключ, цього користувача буде видалено"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Якщо наступного разу ви введете неправильний PIN-код, цього користувача буде видалено"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Якщо наступного разу ви введете неправильний пароль, цього користувача буде видалено"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Якщо наступного разу ви введете неправильний ключ, ваш робочий профіль і його дані буде видалено"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Якщо наступного разу ви введете неправильний PIN-код, ваш робочий профіль і його дані буде видалено"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Якщо наступного разу ви введете неправильний пароль, ваш робочий профіль і його дані буде видалено"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Забагато невдалих спроб. Дані на цьому пристрої буде видалено."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Забагато невдалих спроб. Цього користувача буде видалено."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Забагато невдалих спроб. Цей робочий профіль і його дані буде видалено."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Закрити"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Має містити принаймні стільки символів: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-код має містити принаймні стільки цифр: <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Продовжити"</string>
@@ -638,7 +686,7 @@
     <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>
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Підключ."</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Відключити"</string>
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Створ. пару та підкл."</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Скас.пару"</string>
@@ -648,6 +696,22 @@
     <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>
+    <!-- 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>
@@ -656,7 +720,7 @@
     <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_online_mode_title" msgid="3689050071425683114">"Підключити"</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_profile_header_title" msgid="102745381968579605">"Використовувати для"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Перейменувати"</string>
@@ -769,7 +833,6 @@
     <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_ssid" msgid="5519636102673067319">"Назва мережі"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Введіть ідентифікатор SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безпека"</string>
@@ -788,7 +851,7 @@
     <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_show_password" msgid="6461249871236968884">"Показувати пароль"</string>
     <string name="wifi_ap_band_config" msgid="1611826705989117930">"Виберіть діапазон частот точки доступу"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Діапазон 2,4 ГГц"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Діапазон 5 ГГц"</string>
@@ -819,7 +882,7 @@
     <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="wifi_connect" msgid="1076622875777072845">"Підключити"</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>
@@ -834,7 +897,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 +933,28 @@
     <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>
+    <!-- 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_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">"Увімкнення точки доступу…"</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 +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">"Адреса, яку знатимуть екстрені служби, якщо ви зателефонуєте 112 через Wi-Fi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
@@ -1004,23 +1086,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1044,8 +1136,19 @@
     <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>
+    <!-- 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>
@@ -1299,6 +1402,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>
@@ -1330,6 +1434,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Очистити карту SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Стерти всі дані на внутрішньому носії USB, як-от музику чи фото"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Стерти всі дані на карті SD, такі як музика чи фото."</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Стерти eSIM-карти"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Стерти всі eSIM-карти на телефоні. Ваш тарифний план не буде скасовано."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Стерти всі eSIM-карти на планшеті. Ваш тарифний план не буде скасовано."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Скинути пристр."</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Скинути налаштування"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Стерти всю особисту інформацію та завантажені додатки? Цю дію не можна скасувати."</string>
@@ -1341,9 +1448,9 @@
     <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_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>
@@ -1351,27 +1458,21 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
+    <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_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1505,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>
@@ -1519,6 +1620,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1580,6 +1687,7 @@
     <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="default" msgid="1477351142334784771">"На карті SD"</string>
+    <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>
@@ -1689,6 +1797,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"Допомога під час введення"</string>
@@ -1785,7 +1898,7 @@
     <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_title" msgid="4204111425716868288">"Параметри, пов’язані із зором"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ви можете налаштувати цей пристрій для своїх потреб. Ці спеціальні можливості можна пізніше змінити в налаштуваннях."</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Програми зчитування з екрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудіо та текст на екрані"</string>
@@ -1915,6 +2028,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 +2100,46 @@
     <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>
@@ -1995,7 +2154,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>
@@ -2047,6 +2207,8 @@
     <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>
+    <!-- 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>
@@ -2668,7 +2830,7 @@
     <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">"Завжди телефонувати через цю SIM-карту"</string>
-    <string name="select_sim_for_data" msgid="2366081042162853044">"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>
@@ -2706,17 +2868,20 @@
       <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>
     <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_mobile_networks" msgid="8995946622054642367">"мобільний зв’язок, мобільний, оператор мобільного зв’язку, без дротів, трафік, 4g, 3g, 2g, lte"</string>
@@ -2761,6 +2926,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">"Налаштувати NFC-тег для Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Торкніться тегу, у який потрібно записати дані…"</string>
@@ -2889,8 +3060,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Картинка в картинці"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дозволити функцію картинки в картинці"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Додаток зможе створювати вікно з картинкою в картинці, доки додаток відкрито або після виходу з нього (наприклад, щоб продовжити перегляд відео). Це вікно з’являтиметься поверх інших додатків."</string>
-    <string name="picture_in_picture_on" msgid="6103704909710176555">"Так"</string>
-    <string name="picture_in_picture_off" msgid="5654388666434625247">"Ні"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ у режимі \"Не турбувати\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Установлені додатки не запитували доступу до функції \"Не турбувати\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
@@ -3029,11 +3198,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 +3205,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>
@@ -3114,7 +3278,7 @@
     <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>
@@ -3167,6 +3331,14 @@
     <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>
+    <!-- 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>
@@ -3261,8 +3433,9 @@
     <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="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>
@@ -3274,14 +3447,12 @@
     <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_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="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>
@@ -3372,8 +3543,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,14 +3567,14 @@
       <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="no_default_home" msgid="7184117487704520238">"Головний додаток не вибрано"</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>
@@ -3464,7 +3634,6 @@
     <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="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>
@@ -3535,28 +3704,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3674,6 +3870,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 +3884,10 @@
     <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>
+    <!-- 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-ur/arrays.xml b/res/values-ur/arrays.xml
index 5d159c7..27a2b63 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"اچھا"</item>
     <item msgid="8986346415847956850">"عمدہ"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"ہمیشہ"</item>
-    <item msgid="844721238536786870">"صرف پلگ ان ہونے پر"</item>
-    <item msgid="1986753720941888596">"کبھی نہیں"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"ہمیشہ"</item>
-    <item msgid="7433294150916905997">"صرف پلگ ان ہونے پر"</item>
-    <item msgid="1390404486722375028">"کبھی نہیں"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"آخری 30 دن"</item>
     <item msgid="6600989128423965319">"استعمال کا دور سیٹ کریں…"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 6d133e6..647f42e 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -23,13 +23,13 @@
     <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="other">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم دور ہیں۔</item>
       <item quantity="one">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> قدم دور ہیں۔</item>
     </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 +41,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 +107,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">"‏یہ اس کے ساتھ آپ کے کنکشن کو ختم کر دے گا:&amp;‎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">"آپ کو بلوٹوتھ ترتیبات میں تبدیلی کرنے کی اجازت نہیں ہے۔"</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> قریبی آلات کیلئے مرئی ہے۔"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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) -->
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"اکاؤنٹس"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"مقام"</string>
     <string name="account_settings_title" msgid="626177544686329806">"اکاؤنٹس"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"سیکیورٹی اور مقام"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"مرموز کاری اور اسناد"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"فون مرموز کیا گيا"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"آلہ کی مرموز کاری ہو گئی"</string>
@@ -354,40 +378,55 @@
     <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>
@@ -449,6 +488,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 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"غیر مقفل کرنے کا پیٹرن تبدیل کریں"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"‏غیر مقفل کرنے کا PIN تبدیل کریں"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"غیر مقفل کرنے کا پاس ورڈ تبدیل کریں"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"دوبارہ کوشش کریں۔ کوشش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>۔"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"آخری کوشش"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"اگر آپ نے اس کوشش میں غلط دفتری پیٹرن داخل کیا تو آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"‏اگر آپ نے اس کوشش میں غلط دفتری PIN داخل کیا تو آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"اگر آپ نے اس کوشش میں غلط دفتری پاسورڈ داخل کیا تو آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"بہت زیادہ غلط کوششیں۔ آپ کا دفتری پروفائل اور وابستہ ڈیٹا اس آلہ سے ہٹا دیا جائے گا۔"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"برخاست کریں"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"دوبارہ کوشش کریں۔ کوشش <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> از <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>۔"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"آپ کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"اگر آپ نے اگلی کوشش میں غلط پیٹرن درج کیا، تو آلات کا یہ ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"‏اگر آپ نے اگلی کوشش میں غلط PIN درج کیا، تو آلات کا یہ ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"اگر آپ نے اگلی کوشش میں غلط پاس ورڈ درج کیا، تو آلات کا یہ ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"اگر آپ نے اگلی کوشش میں غلط پیٹرن درج کیا، تو اس صارف کو حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"‏اگر آپ نے اگلی کوشش میں غلط PIN درج کیا، تو اس صارف کو حذف کر دیا جائے گا"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"اگر آپ نے اگلی کوشش میں غلط پاس ورڈ درج کیا، تو اس صارف کو حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"اگر آپ نے اگلی کوشش میں غلط پیٹرن درج کیا، تو آپ کا دفتری پروفائل اور اس کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"‏اگر آپ نے اگلی کوشش میں غلط PIN درج کیا، تو آپ کا دفتری پروفائل اور اس کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"اگر آپ نے اگلی کوشش میں غلط پاس ورڈ درج کیا، تو آپ کا دفتری پروفائل اور اس کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"بہت زیادہ غلط کوششیں۔ آلات کا یہ ڈیٹا حذف کر دیا جائے گا۔"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"بہت زیادہ غلط کوششیں۔ اس صارف کو حذف کر دیا جائے گا۔"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"بہت زیادہ غلط کوششیں۔ یہ دفتری پروفائل اور اس کا ڈیٹا حذف کر دیا جائے گا۔"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"برخاست کریں"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"کم از کم <xliff:g id="COUNT">%d</xliff:g> حروف پر مشتمل ہونا چاہیے"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"‏PIN کم از کم <xliff:g id="COUNT">%d</xliff:g> ہندسوں کا ہونا چاہیے"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"جاری رکھیں"</string>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +812,6 @@
     <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_ssid" msgid="5519636102673067319">"نیٹ ورک کا نام"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"‏SSID درج کریں"</string>
     <string name="wifi_security" msgid="6603611185592956936">"سیکیورٹی"</string>
@@ -810,7 +874,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 +910,28 @@
     <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>
+    <!-- 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_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">"ہاٹ اسپاٹ آن ہو رہا ہے…"</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 +978,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>
@@ -980,23 +1063,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1113,19 @@
     <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>
+    <!-- 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>
@@ -1273,6 +1377,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>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"‏SD کارڈ حذف کریں"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"‏داخلی USB اسٹوریج پر موجود سبھی ڈیٹا، جیسے موسیقی یا تصاویر کو حذف کریں"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"‏SD کارڈ پر موجود سبھی ڈیٹا حذف کریں، جیسے موسیقی یا تصاویر"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"‏eSIMs مٹائیں"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"‏فون پر سبھی eSIMs صاف کریں۔ اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"‏ٹیبلیٹ پر سبھی eSIMs صاف کریں۔ اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ٹیبلٹ کو دوبارہ ترتیب دیں"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"فون کو دوبارہ ترتیب دیں"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"آپ کی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس ہٹا دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں!"</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,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>
@@ -1491,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,8 +1658,9 @@
     <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="default" msgid="1477351142334784771">"‏SD کارڈ پر"</string>
+    <string name="disabled" msgid="9206776641295849915">"غیر فعال"</string>
     <string name="not_installed" msgid="2797554494953450291">"اس صارف کیلئے انسٹال نہیں ہے"</string>
-    <string name="installed" msgid="3070865169422600098">"انسٹال کردہ"</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>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"ان پٹ سے متعلق معاونت"</string>
@@ -1873,6 +1987,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 +2057,46 @@
     <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>
@@ -1953,7 +2111,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">"‏CPU کل"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU پیش منظر"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار رکھیں"</string>
@@ -2005,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2652,17 +2813,20 @@
     <!-- 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>
     <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_mobile_networks" msgid="8995946622054642367">"‏سیلولر، موبائل، سیل کیریئر، وائرلیس، ڈیٹا، 4g,3g, 2g, lte"</string>
@@ -2707,6 +2871,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>
@@ -2826,13 +2996,11 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"دھندلا پن کم کریں (تجویز کردہ)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"فلکر کم کریں"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"تصویر میں تصویر"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"کوئی بھی انسٹال کردہ ایپ تصویر میں تصویر کو سپورٹ نہیں کرتی"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"کوئی ایپس تصویر میں تصویر کا معاون نہیں ہے"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"تصویر میں تصویر"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"تصویر میں تصویر"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"تصویر میں تصویر کی اجازت دیں"</string>
     <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>
@@ -2963,11 +3131,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 +3138,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 +3256,12 @@
     <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>
+    <!-- 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>
@@ -3185,8 +3354,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="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>
@@ -3198,8 +3368,6 @@
     <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_switch_title" msgid="3621381992793251070">"اس ماخذ کو اجازت دیں"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"کیمرا کیلئے دو بار مروڑیں"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"اپنی کلائی کو دو بار مروڑ کر کیمرا ایپ کھولیں"</string>
@@ -3294,8 +3462,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>
@@ -3315,7 +3482,7 @@
       <item quantity="one">ڈیٹا سیور آن ہو تو 1 ایپ کو غیر محدود ڈیٹا استعمال کرنے کی اجازت ہے</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ڈیٹا سیور"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"غیر محدود ڈیٹا تک رسائی"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"غیر محدود ڈیٹا"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"پس منظر کا ڈیٹا آف ہے"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"آن"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"آف"</string>
@@ -3380,7 +3547,6 @@
     <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_warning" msgid="9086859595338944882">"‏ہو سکتا ہے آپ کو پریمیم SMS کے پیسے ادا کرنا پڑیں اور یہ آپ کے کیرئیر بلز میں شامل ہو جائیں گے۔ اگر آپ ایک ایپ کیلئے اجازت فعال کرتے ہیں تو آپ اس ایپ کو استعمال کرکے آپ پریمیم SMS بھیج پائیں گے۔"</string>
@@ -3445,28 +3611,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3570,6 +3763,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 +3777,10 @@
     <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>
+    <!-- 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-uz/arrays.xml b/res/values-uz/arrays.xml
index e43e78b..31c1102 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Yaxshi"</item>
     <item msgid="8986346415847956850">"A’lo"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"O‘chirilmasin"</item>
-    <item msgid="844721238536786870">"Faqat quvvat olayotganda"</item>
-    <item msgid="1986753720941888596">"Hech qachon"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"O‘chirilmasin"</item>
-    <item msgid="7433294150916905997">"Faqat quvvat olayotganda"</item>
-    <item msgid="1390404486722375028">"Hech qachon"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"So‘nggi 30 kun"</item>
     <item msgid="6600989128423965319">"Internetdan foyd-sh davri…"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 0df934c..0bb4fe0 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Rad etish"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Yopish"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Almashtirish"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Noma’lum"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Dasturchi sifatida ro‘yxatdan o‘tishni yakunlashga <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> qadam qoldi.</item>
       <item quantity="one">Dasturchi sifatida ro‘yxatdan o‘tishni yakunlashga <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> qadam qoldi.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Sizda Bluetooth sozlamalarini o‘zgartirish uchun ruxsat yo‘q."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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> 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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Qurilmalaringiz"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Sana va vaqt"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vaqt zonasini tanlang"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,8 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hisoblar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Joylashuv"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hisoblar"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Xavfsizlik va joylashuv"</string>
+    <!-- no translation found for security_settings_title (4918904614964215087) -->
+    <skip />
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Shifrlash va hisob ma’lumotlari"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon shifrlangan"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Qurilma shifrlangan"</string>
@@ -354,40 +378,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +488,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 +560,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Grafik kalitni o‘zgartirish"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Qulfdan ochish PIN kodini o‘zgartirish"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Qulfni ochish parolini o‘zgartirish"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Qaytadan urinib ko‘ring. Urinish: <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"So‘nggi urinish"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Agar bu urinishda ishchi profil grafik kalitini noto‘g‘ri kiritsangiz, ishchi profilingiz va unga bog‘liq ma’lumotlar mazkur qurilmadan o‘chirib tashlanadi."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Agar bu urinishda ishchi profil PIN kodini noto‘g‘ri kiritsangiz, ishchi profilingiz va unga bog‘liq ma’lumotlar mazkur qurilmadan o‘chirib tashlanadi."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Agar bu urinishda ishchi profil parolini noto‘g‘ri kiritsangiz, ishchi profilingiz va unga bog‘liq ma’lumotlar mazkur qurilmadan o‘chirib tashlanadi."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Juda ko‘p marta muvaffaqiyatsiz urinishlar amalga oshirildi. Ishchi profilingiz va unga bog‘liq ma’lumotlar bu qurilmadan o‘chirib tashlanadi."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Yopish"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Qaytadan urining. Urinish: <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> / <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Bitta urinish qoldi"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Agar grafik kalitni xato kiritsangiz, bu qurilmadagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Agar PIN kodni xato kiritsangiz, bu qurilmadagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Agar parolni xato kiritsangiz, qurilmadagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Agar grafik kalitni xato kiritsangiz, bu foydalanuvchi o‘chirib tashlanadi"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Agar PIN kodni xato kiritsangiz, bu foydalanuvchi o‘chirib tashlanadi"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Agar parolni xato kiritsangiz, bu foydalanuvchi o‘chirib tashlanadi"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Agar grafik kalitni xato kiritsangiz, ishchi profil va undagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Agar PIN kodni xato kiritsangiz, ishchi profil va undagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Agar parolni xato kiritsangiz, ishchi profil va undagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Juda ko‘p marta muvaffaqiyatsiz urinishlar amalga oshirildi. Bu qurilmadagi ma’lumotlar o‘chirib tashlanadi."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Juda ko‘p marta muvaffaqiyatsiz urinishlar amalga oshirildi. Bu foydalanuvchi o‘chirib tashlanadi."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Juda ko‘p marta muvaffaqiyatsiz urinishlar amalga oshirildi. Bu ishchi profil va undagi ma’lumotlar o‘chirib tashlanadi."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Yopish"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Kamida <xliff:g id="COUNT">%d</xliff:g> ta belgi bo‘lishi kerak"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN kod kamida <xliff:g id="COUNT">%d</xliff:g> raqamdan iborat bo‘lishi shart"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Davom etish"</string>
@@ -626,6 +675,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +812,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Simsiz router xavfsizlik sozlamasi (TKIP) qo‘llab-quvvatlanmaydi"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Tasdiqlanmadi. Iltimos, yana takrorlang."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Boshqa WPS sessiyasi aniqlandi. Iltimos, bir necha daqiqadan so‘ng yana takrorlang."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi aloqasi uzildi. WPS parametrini sozlash bekor qilindi."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Tarmoq nomi"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Tarmoq nomini (SSID) kiriting"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Himoya"</string>
@@ -810,7 +874,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>
@@ -847,9 +910,28 @@
     <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>
+    <!-- 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_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">"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,20 +978,21 @@
     <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>
-    <string name="sound_settings" msgid="5534671337768745343">"Tovush"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"Ovoz"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ovoz balandligi"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musiqa effektlari"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Qo‘ng‘iroq ovozi"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Ovozsizligida tebranish"</string>
-    <string name="notification_sound_title" msgid="5137483249425507572">"Standart bildirishnoma tovushi"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Standart bildirishnoma signali"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Rington"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Xabarnoma"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Kirish qo‘ng‘irog‘i ovoz balandligidan xabarnomalar uchun foydalanish"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"Ishchi profillarni qo‘llab-quvvatlamaydi"</string>
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standart bildirishnoma tovushi"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standart bildirishnoma signali"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Musiqa va videolar uchun ovoz balandligini sozlash"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Signal"</string>
@@ -952,7 +1035,7 @@
     <string name="search_settings_summary" msgid="9205656546570654169">"Qidiruv sozlamalari va tarix boshqaruvi"</string>
     <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="accelerometer_title" msgid="7854608399547349157">"Ekranni avtomatik burish"</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,32 +1063,42 @@
     <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>
+    <!-- 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">"Boshlanish vaqti"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Tugash vaqti"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Yoniq / <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">"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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fon rasmi"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Standart"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Maxsus"</string>
-    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Fon rasmini o‘zgartirish"</string>
+    <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Fon rasmini o‘zgartiring"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Ekran uchun fon rasmini tanlang"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fon rasmi qayerdan tanlansin"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fon rasmini tanlang"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Ekran lavhasi"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Quvvat olayotganda yoki dok-stansiyaga ulanganda"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Har doim"</string>
@@ -1020,8 +1113,19 @@
     <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="doze_summary" msgid="3846219936142814032">"Bildirishnoma kelsa, ekran yonadi"</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">"Bildirishnoma kelganda ekran yonadi"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Har doim yoniq"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni ko‘rsatish"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Shrift o‘lchami"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Matnni kattalashtirish yoki kichiklashtirish"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM karta qulfi sozlamalari"</string>
@@ -1273,6 +1377,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>
@@ -1302,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-kartani tozalash"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ichki USB xotiradan musiqa va rasmlar kabi barcha ma‘lumotlarni tozalash"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD-kartadagi barcha ma’lumotlar, jumladan, musiqa va rasmlarni o‘chirib tashlash"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"eSIM kartalarni tozalash"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Telefondan barcha eSIM kartalarni tozalash. Bunda mobil xizmat tarif rejalari bekor qilinmaydi."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Planshetdan barcha eSIM kartalarni tozalash. Bunda mobil xizmat tarif rejalari bekor qilinmaydi."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Planshetni dastlabki sozlamarga qaytarish"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon sozlamalarini tiklash"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Barcha shaxsiy ma’lumotlaringiz va yuklab olingan ilovalar o‘chirib tashlansinmi? Ularni keyin qayta tiklab bo‘lmaydi."</string>
@@ -1324,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,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>
@@ -1446,7 +1548,7 @@
     <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Davom etish uchun ishchi profilingiz parolini kiriting. Qurilma o‘chirib yoqilgandan so‘ng talab qilinadi."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"PIN-kod noto‘g‘ri"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Parol noto‘g‘ri"</string>
-    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Grafik kalit xato"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Grafik kalit noto‘g‘ri"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"Qurilma xavfsizligi"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Grafik kalitni o‘zgartirish"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Qulfni ochish PIN kodini o‘zgartirish"</string>
@@ -1491,6 +1593,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1658,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Ishlayotgan"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB xotira"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartada"</string>
+    <string name="disabled" msgid="9206776641295849915">"O‘chiq"</string>
     <string name="not_installed" msgid="2797554494953450291">"Bu foyd-chi u-n o‘rnatilmagan"</string>
     <string name="installed" msgid="3070865169422600098">"O‘rnatilgan"</string>
     <string name="no_applications" msgid="7336588977497084921">"Hech qanday ilova yo‘q."</string>
@@ -1659,6 +1768,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1987,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 +2063,46 @@
     <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>
+    <!-- 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">"Fonar"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
@@ -1959,7 +2117,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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 +2170,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2279,7 +2440,7 @@
     <string name="enter_password" msgid="8035706727471334122">"Androidni ishga tushirish uchun parolni kiriting"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidni ishga tushirish uchun PIN kodni kiriting"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidni ishga tushirish uchun chizmali parolni chizing"</string>
-    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Grafik kalit xato"</string>
+    <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"Grafik kalit noto‘g‘ri"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"Parol noto‘g‘ri"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN-kod noto‘g‘ri"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"Tekshirilmoqda…"</string>
@@ -2375,7 +2536,7 @@
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Pulli Wi-Fi tarmoqlari"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Pulli tarmoqlarni belgilash uchun Wi-Fi aloqasini yoqing."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin."</string>
-    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Favqulodda chaqiruv"</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Favqulotda qo‘ng‘iroq"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Chaqiruvga qaytish"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Tarmoq nomi"</string>
     <string name="vpn_type" msgid="5435733139514388070">"Turi"</string>
@@ -2666,17 +2827,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Birlamchi ilovalar"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Tillar, vaqt, zaxira, yangilanishlar"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Sozlamalar"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Sozlamalar ichidan qidirish"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Sozlamalar ichidan qidirish"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Qidiruv sozlamalari"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Qidiruv sozlamalari"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, tarmoq, aloqa"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"SMS, matnli xabar, xabarlar, xabarlashuv"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobil, mobil aloqa operatori, simsiz, internet, 4g, 3g, 2g, lte"</string>
@@ -2721,6 +2885,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"imo-ishora orqali matn kiritish"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"to‘lash, bosish, to‘lovlar"</string>
     <string name="keywords_backup" msgid="470070289135403022">"zaxira, zaxira nusxa olish"</string>
+    <!-- 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’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>
@@ -2739,9 +2909,9 @@
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Rington"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirishnomalar ovozi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon ringtoni"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"Standart bildirishnoma tovushi"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Standart bildirishnoma signali"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Ilova tovushi"</string>
-    <string name="notification_sound_default" msgid="565135733949733766">"Standart bildirishnoma tovushi"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Standart bildirishnoma signali"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standart signal"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Chaqiruv vaqtida tebranish"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Boshqa ovozlar"</string>
@@ -2772,7 +2942,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Faqat signallar"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Jimjitlik"</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">"Vizual bildirishnomalarni bloklash"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Visual bildirishnomalarni bloklash"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Ishchi profil ovozlari"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Shaxsiy profil ovozlaridan foydalanish"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Tovushlar ishchi va shaxsiy profillar uchun bir xil"</string>
@@ -2790,7 +2960,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Bildirishnomalar"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Kengaytirilgan sozlamalar"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Ishga oid bildirishnomalar"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"Bildirishnoma belgisi"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Bildirishnoma nuqtalarini ko‘rsatish"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Indikator"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Qulflangan ekranda"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bildirishnomalar to‘liq chiqsin"</string>
@@ -2819,7 +2989,7 @@
     <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="default_notification_assistant" msgid="7631945224761430146">"Bildirishnoma yordamchisi"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirishnomalarga ruxsat"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirishnomalarga kirish"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ishchi profil bildirishnomalariga kirish taqiqlangan"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ilovalar bildirishnomalarni ko‘ra olmaydi"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2840,17 +3010,15 @@
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Xiralikni kamaytirish (tavsiya etiladi)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Miltillashni kamaytirish"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"Tasvir ustida tasvir"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"O‘rnatilgan ilovalar Tasvir ustida tasvir rejimi bilan mos emas"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"O‘rnatilgan ilovalar “tasvir ustida tasvir” rejimini qo‘llab-quvvatlamaydi"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"tasvir ustida tasvir"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Tasvir ustida tasvir"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tasvir ustida tasvir rejimiga ruxsat berish"</string>
-    <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="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="manage_zen_access_title" msgid="2611116122628520522">"“Bezovta qilinmasin” fuksiyasi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hech qaysi ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu qurilmada ushbu ilova bildirishnomalarini bloklamoqda"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu qurilmada ushbu ilova bildirishnomasini bloklamoqda"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bu qurilmada ushbu turkum bildirishnomalarini bloklamoqda"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Turkumlar"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Boshqa"</string>
@@ -2871,8 +3039,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirishnomalar boshqa ko‘rsatilmasin"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Bildirishnomalar ko‘rsatilsin"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Fonda yoki tashqi qurilmalarda bildirishnomalar hech qachon ko‘rsatilmasin"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"Bildirishnoma belgisini ko‘rsatish"</string>
-    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildirishnoma belgisini ko‘rsatish"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"Bildirishnoma nuqtasini ko‘rsatish"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildirishnoma nuqtasini ko‘rsatish"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bezovta qilinmasin rejimi ustidan yozish"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Bezovta qilinmasin rejimida faqat muhim bildirishnomalarga ruxsat berilgan bo‘lsa, ushbu bildirishnomalarga ham ruxsat beriladi"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Qulflangan ekranda"</string>
@@ -2916,7 +3084,7 @@
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Kunlar"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"–"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Har kuni"</string>
-    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Signal bilan tugatish"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Keyingi signal avvalgisining to‘xtash vaqtini o‘zgartirishi mumkin"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Signalning to‘xtash vaqti kelganida yoki keyingi signal ishlagan vaqtda to‘xtatish (qaysi biri birinchi sodir bo‘lishiga qarab)"</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>
@@ -2927,7 +3095,7 @@
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Tanlangan xabarlar"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Har kimdan"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Faqat kontaktlardan"</string>
-    <string name="zen_mode_from_starred" msgid="2678345811950997027">"Faqat yulduzchali kontaktlardan"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"Faqat sevimli 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_reminders" msgid="5458502056440485730">"Eslatmalar"</string>
@@ -2954,9 +3122,9 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"“Faqat signallar” rejimini <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> gacha faol bo‘ladigan qilib yoqish"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Har doim bezovta qilinaversin"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Ekran yoniqligida"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Ekran yoniq bo‘lganda bloklash"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"“Bezovta qilinmasin” rejimi orqali bildirishnomalar o‘chirib qo‘yilganda ular ekranda qalqib chiqmasin"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Ekran o‘chiqligida"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Ekran o‘chiq bo‘lganda bloklash"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"“Bezovta qilinmasin” rejimi orqali bildirishnomalar o‘chirib qo‘yilganda ekran va bildirishnomalar uchun yoritkichli indikator yoqilmasin"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"“Bezovta qilinmasin” funksiyasi orqali ovozsiz qilingan bildirishnomalar tomonidan ekranning yoqilishi oldini olish"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"O‘chiq"</string>
@@ -2977,11 +3145,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 +3152,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>
@@ -3003,7 +3166,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI raqamiga aloqador ma’lumotlar"</string>
     <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>-uya)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Birlamchi ilova"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Havolalarni ochish"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Ishga tushirish uchun havolalar"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Mos havolalar ochilsin"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Avtomatik ochilsin"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Mos havolalar"</string>
@@ -3056,10 +3219,10 @@
     <string name="configure_apps" msgid="6685680790825882528">"Ilovalarni sozlash"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Noma’lum ilova"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Ilovalar uchun ruxsatlar"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> ruxsatnomasiga ega ilovalar"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Ruxsat berilgan ilovalar (<xliff:g id="APPS">%1$s</xliff:g>)"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Teginib yoqish"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Qurilmani yoqish uchun ekranning istalgan joyiga ikki marta bosing"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Havolalarni ochish"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Ishga tushirish uchun havolalar"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Mos havolalar ochilmasin"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Faqat <xliff:g id="DOMAIN">%s</xliff:g> havolalari ochilsin"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> va boshqa havolalarni ochishi mumkin"</string>
@@ -3107,6 +3270,12 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Ogohlantirishlar"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Butun qurilmaning quvvat sarfi"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Ilovalardan foydalanish"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Batareya sarfi yuqori"</string>
+    <plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ta ilova xato ishlayapti</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ilovasi xato ishlayapti</item>
+    </plurals>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,22 +3356,23 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"Yo‘q"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Bu ilovadan foydalanish vakolatini o‘chirib qo‘ysangiz ham, administrator ishchi profilingizdagi ilovalarni kuzata oladi"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"Ishlatilgan belgilar soni: <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">"Boshqa ilovalar ustidan ochilish"</string>
-    <string name="system_alert_window_settings" msgid="8466613169103527868">"Boshqa ilovalar ustidan ochilish"</string>
+    <string name="draw_overlay" msgid="6564116025404257047">"Boshqa oynalar ustidan ochish"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"Boshqa oynalar ustidan ochish"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Ilovalar"</string>
-    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Boshqa ilovalar ustidan ochilish"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Boshqa oynalar ustidan ochish"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"Boshqa ilovalar ustidan ochilishiga ruxsat"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"Ilovani barcha oynalar ustidan ochish"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"Interfeys elementlarini boshqa oynalar ustidan ochishga ruxsat beradi. Bu funksiya ilovalar bilan ishlashingizga xalaqit qilishi yoki ularning interfeysini buzib tashlashi mumkin."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtual borliq tinglovchi stereo yordamchi xizmat"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"tizim signal muloqot oynasi boshqa ilovalar ustidan ochilish"</string>
-    <string name="overlay_settings" msgid="6930854109449524280">"Boshqa ilovalar ustidan ochilish"</string>
+    <string name="overlay_settings" msgid="6930854109449524280">"Boshqa oynalar ustidan ochish"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> ta ilova boshqa oynalar ustidan ochilishi mumkin (jami: <xliff:g id="COUNT_1">%2$d</xliff:g>)"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Ruxsatga ega ilovalar"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Ha"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Yo‘q"</string>
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Ruxsat berilgan"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Ruxsat berilmagan"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Notanish ilovalarni o‘rnatish"</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="write_settings" msgid="4797457275727195681">"Tizim sozlamalarini o‘zgar-sh"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"tizim sozlamalarini o‘zgartirish"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"Tizim sozlamalarini o‘zgartirishga ruxsat bor ilovalar: <xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"Boshqa ilovalarni o‘rnatishi mumkin"</string>
@@ -3212,8 +3382,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Tizim sozlamalarini o‘zgartirish uchun ruxsat"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Tizim sozlamalarini o‘zgartirishga ruxsat"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Bu ruxsatnoma ilovaga tizim sozlamalarini o‘zgaritish uchun ruxsat beradi."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Ha"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Yo‘q"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Bu manbaga ruxsat bering"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera uchun bilakni ikki marta bukish"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Kamera ilovasini ochish uchun bilagingizni ikki marta buking"</string>
@@ -3308,8 +3476,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Ma’lumotlarni uzatishdagi ogohlantirishlar: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Ma’lumotlarni uzatishdagi ogohlantirishlar: <xliff:g id="ID_1">%1$s</xliff:g> / Ma’lumotlarni uzatish cheklovi: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"To‘lov davriyligi"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Har oyning <xliff:g id="ID_1">%1$s</xliff:g>-sanasidan to‘lov davri boshlanadi"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Har oyning <xliff:g id="ID_1">%1$s</xliff:g>-sanasidan"</string>
+    <string name="billing_cycle_fragment_summary" msgid="8231066353654583106">"Har oyda (<xliff:g id="ID_1">%1$s</xliff:g>-kuni)"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Tarmoq cheklovlari"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ta cheklov</item>
@@ -3329,19 +3496,19 @@
       <item quantity="one">Trafik tejash rejimi yoniqligida 1 ta ilova internet-trafikdan cheklovsiz foydalanishi mumkin</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Trafik tejash"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Cheklanmagan internet-trafik"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Ma’lumotlarga cheksiz ruxsat"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Fondagi internet o‘chiq"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Yoniq"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"O‘chiq"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Cheklanmagan internet-trafik"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Quvvat tejash rejimida internet-trafikdan cheklovsiz foydalanish"</string>
-    <string name="home_app" msgid="4066188520886810030">"Bosh ekran ilovasi"</string>
+    <string name="home_app" msgid="4066188520886810030">"Bosh ilova"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Birlamchi bosh ilova ko‘rsatilmagan"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Xavfsiz ishga tushirish"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Qurilmangizni xavfsiz ishga tushirish uchun grafik kalit shart. Qurilma o‘chiqligida qo‘ng‘iroqlar, xabarlar, bildirishnomalar va uyg‘otkich signallarini qabul qila olmaydi."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Qurilmangizni xavfsiz ishga tushirish uchun PIN kod shart. Qurilma o‘chiqligida qo‘ng‘iroqlar, xabarlar, bildirishnomalar va uyg‘otkich signallarini qabul qila olmaydi."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Qurilmangizni xavfsiz ishga tushirish uchun parol shart. Qurilma o‘chiqligida qo‘ng‘iroqlar, xabarlar, bildirishnomalar va uyg‘otkich signallarini qabul qila olmaydi."</string>
-    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Yana barmoq izi qo‘shish"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Yana bitta barmoq izi qo‘shing"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Boshqa barmoq bilan ochish"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Yoniq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"O‘chiq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3375,7 +3542,7 @@
     <string name="notification_log_details_icon" msgid="8939114059726188218">"nishoncha"</string>
     <string name="notification_log_details_parcel" msgid="243148037601903212">"paket hajmi"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
-    <string name="notification_log_details_sound" msgid="5506232879598808099">"tovush"</string>
+    <string name="notification_log_details_sound" msgid="5506232879598808099">"ovoz"</string>
     <string name="notification_log_details_vibrate" msgid="6890065466625335940">"tebranish"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"birlamchi"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"yo‘q"</string>
@@ -3394,11 +3561,10 @@
     <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="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>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Pulli SMS xabarlarga ruxsat"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"SMSdan foydalanish"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Boshqa qurilmalarga ko‘rinmaydi"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> qurilmasiga ulangan"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Bir nechta qurilmaga ulangan"</string>
@@ -3423,7 +3589,7 @@
     <string name="support_help_feedback_title" msgid="693440287222186718">"Muammolar yechimini qidirish va fikr-mulohaza yuborish"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Ko‘mak xizmati bilan bog‘lanish"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Kirish"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Hisobingizga kira olmayapsizmi?"</string>
+    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Hisobingizga kirib bo‘lmadimi?"</string>
     <string name="support_disclaimer_title" msgid="4825302018208770031">"Tizim haqida ma’lumotlarni yuborish"</string>
     <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Boshqa ko‘rsatilmasin"</string>
     <string name="support_account_request_prefix" msgid="6387847874661861650">"So‘rov yuborish…"</string>
@@ -3459,28 +3625,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Qo‘llanma"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Joy bo‘shatish"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Imo-ishoralar"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Tezkor ishoralar"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonni boshqarish uchun tezkor imo-ishoralar"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Planshetni boshqarish uchun tezkor imo-ishoralar"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Qurilmani boshqarish uchun tezkor imo-ishoralar"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraga o‘tish"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamerani tezda ochish uchun quvvat tugmasini ikki marta bosing. Har qanday ekranda ishlaydi."</string>
+    <!-- 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">"Kamerani almashtirish"</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">"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_pickup_title" product="default" msgid="818688002837687268">"Bildirishnomalarni tekshirish uchun ko‘tarish"</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">"Tekshirish uchun telefonni yuqoriga ko‘taring"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tekshirish uchun planshetni yuqoriga ko‘taring"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Tekshirish uchun qurilmani yuqoriga ko‘taring"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Bildirishnomalarni tezkor tekshirish uchun telefonni qo‘lingizga oling."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Bildirishnomalarni tezkor tekshirish uchun planshetni qo‘lingizga oling."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Bildirishnomalarni tezkor tekshirish uchun qurilmani qo‘lingizga oling."</string>
+    <!-- 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">"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>
+    <!-- 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">"Kamerani ochish uchun ko‘taring"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Kamerani avtomatik ochish uchun telefonni suratga olish holatiga (yotiq yoki tik holat) keltiring. Telefon uyqu rejimida yoki qulflangan bo‘lsa ishlaydi."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Telefon uyqu rejimida yoki qulflangan holatida ham suratga oling"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Qo‘shimcha ishora"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Muhimlik"</string>
@@ -3584,6 +3777,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 +3791,10 @@
     <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>
+    <!-- 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-vi/arrays.xml b/res/values-vi/arrays.xml
index 3856fc0..641f6ed 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Tốt"</item>
     <item msgid="8986346415847956850">"Tuyệt vời"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Luôn luôn"</item>
-    <item msgid="844721238536786870">"Chỉ khi cắm vào nguồn điện"</item>
-    <item msgid="1986753720941888596">"Không bao giờ"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Luôn luôn"</item>
-    <item msgid="7433294150916905997">"Chỉ khi cắm vào nguồn điện"</item>
-    <item msgid="1390404486722375028">"Không bao giờ"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"30 ngày qua"</item>
     <item msgid="6600989128423965319">"Đặt chu kỳ sử dụng..."</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 66a148f..ff3262f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Từ chối"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Đóng"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Chuyển đổi"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Không xác định"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Bây giờ, bạn chỉ cần thực hiện <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> bước nữa là trở thành nhà phát triển.</item>
       <item quantity="one">Bây giờ, bạn chỉ cần thực hiện <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> bước nữa là trở thành nhà phát triển.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Bạn không có quyền thay đổi cài đặt Bluetooth."</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> hiển thị với thiết bị lân cận khi cài đặt Bluetooth mở."</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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Thiết bị của bạn"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Ngày và giờ"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Chọn múi giờ"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -329,7 +352,7 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Tài khoản"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vị trí"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tài khoản"</string>
-    <string name="security_settings_title" msgid="6134528367364159294">"Bảo mật và vị trí"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"Bảo mật &amp; vị trí"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Mã hóa và thông tin đăng nhập"</string>
     <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Điện thoại được mã hóa"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Thiết bị được mã hóa"</string>
@@ -354,40 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Đăng ký chưa hoàn tất"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Đã đến giới hạn thời gian đăng ký dấu vân tay. Hãy thử lại."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Đăng ký dấu vân tay không hoạt động. Hãy thử lại hoặc sử dụng ngón tay khác."</string>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Thay đổi hình mở khóa"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Thay đổi mã PIN mở khóa"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Thay đổi mật khẩu mở khóa"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Thử lại. Lần thử <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Lần thử cuối cùng"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Nếu bạn nhập sai hình mở khóa công việc vào lần thử này, hồ sơ công việc và dữ liệu được liên kết của bạn sẽ bị xóa khỏi thiết bị này."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Nếu bạn nhập sai mã PIN công việc vào lần thử này, hồ sơ công việc và dữ liệu được liên kết của bạn sẽ bị xóa khỏi thiết bị này."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Nếu bạn nhập sai mật khẩu công việc vào lần thử này, hồ sơ công việc và dữ liệu được liên kết của bạn sẽ bị xóa khỏi thiết bị này."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Quá nhiều lần thử sai. Hồ sơ công việc và dữ liệu được liên kết của bạn sẽ bị xóa khỏi thiết bị này."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Loại bỏ"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Thử lại. Lần thử <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g>/<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Dữ liệu của bạn sẽ bị xóa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Nếu bạn nhập hình mở khóa không chính xác vào lần thử tiếp theo, dữ liệu thiết bị này sẽ bị xóa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Nếu bạn nhập mã PIN không chính xác vào lần thử tiếp theo, dữ liệu thiết bị này sẽ bị xóa"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Nếu bạn nhập mật khẩu không chính xác vào lần thử tiếp theo, dữ liệu thiết bị này sẽ bị xóa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Nếu bạn nhập hình mở khóa không chính xác vào lần thử tiếp theo, người dùng này sẽ bị xóa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Nếu bạn nhập mã PIN không chính xác vào lần thử tiếp theo, người dùng này sẽ bị xóa"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Nếu bạn nhập mật khẩu không chính xác vào lần thử tiếp theo, người dùng này sẽ bị xóa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Nếu bạn nhập hình mở khóa không chính xác vào lần thử tiếp theo, hồ sơ công việc của bạn và dữ liệu của hồ sơ công việc sẽ bị xóa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Nếu bạn nhập mã PIN không chính xác vào lần thử tiếp theo, hồ sơ công việc của bạn và dữ liệu của hồ sơ công việc sẽ bị xóa"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Nếu bạn nhập mật khẩu không chính xác vào lần thử tiếp theo, hồ sơ công việc của bạn và dữ liệu của hồ sơ công việc sẽ bị xóa"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Quá nhiều lần thử không chính xác. Dữ liệu thiết bị này sẽ bị xóa."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Quá nhiều lần thử không chính xác. Người dùng này sẽ bị xóa."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Quá nhiều lần thử không chính xác. Hồ sơ công việc này và dữ liệu của hồ sơ công việc sẽ bị xóa."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Loại bỏ"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Phải chứa ít nhất <xliff:g id="COUNT">%d</xliff:g> ký tự"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Mã PIN phải chứa ít nhất <xliff:g id="COUNT">%d</xliff:g> chữ số"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tiếp tục"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Cài đặt bảo mật bộ định tuyến không dây (TKIP) không được hỗ trợ"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Xác thực không thành công. Vui lòng thử lại."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Đã phát hiện một phiên WPS khác. Vui lòng thử lại sau ít phút."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Đã ngắt kết nối Wi‑Fi. Thiết lập WPS đã bị hủy."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Tên mạng"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Nhập SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Bảo mật"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"Đ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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Thời gian bắt đầu"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Thời gian kết thúc"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Bật / <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">"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>
@@ -1014,14 +1106,25 @@
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Không bao giờ"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Tắt"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Để kiểm soát những gì diễn ra khi điện thoại được gắn đế và/hoặc ở chế độ ngủ, hãy bật trình bảo vệ màn hình."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Khi nào khởi động"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Khi khởi động"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Trình bảo vệ màn hình hiện tại"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Bắt đầu ngay"</string>
     <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>
+    <!-- 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">"Bật màn hình khi bạn nhận được thông báo"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Luôn bật"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Hiển thị thời gian, biểu tượng thông báo và các thông tin khác"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Phóng to hoặc thu nhỏ văn bản"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Cài đặt khóa thẻ SIM"</string>
@@ -1152,7 +1255,7 @@
     <string name="storage_low_summary" msgid="7737465774892563129">"Một số chức năng hệ thống, chẳng hạn như đồng bộ hóa, có thể không hoạt động đúng. Hãy cố gắng giải phóng dung lượng bằng cách xóa hoặc bỏ ghim các mục, chẳng hạn như các ứng dụng hoặc nội dung đa phương tiện."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"Đổi tên"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"Gắn"</string>
-    <string name="storage_menu_unmount" msgid="681485356885955898">"Ngắt kết nối"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"Đẩy ra"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"Định dạng"</string>
     <string name="storage_menu_format_public" msgid="7464714208010125682">"Định dạng làm bộ nhớ di động"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"Định dạng làm bộ nhớ trong"</string>
@@ -1180,7 +1283,7 @@
     <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> đã được gắn"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"Không thể gắn <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> đã được đẩy ra an toàn"</string>
-    <string name="storage_unmount_failure" msgid="5758387106579519489">"Không thể ngắt kết nối an toàn <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="storage_unmount_failure" msgid="5758387106579519489">"Không thể đẩy <xliff:g id="NAME">%1$s</xliff:g> ra an toàn"</string>
     <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> đã được định dạng"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"Không thể định dạng <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"Đổi tên bộ nhớ"</string>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN không được để trống."</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"Trường MCC phải có 3 chữ số."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Trường MNC phải có 2 hoặc 3 chữ số."</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"Nhà cung cấp dịch vụ không cho phép thêm APN thuộc loại %s."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Đang khôi phục cài đặt APN mặc định."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Đặt lại về mặc định"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Đặt lại cài đặt APN mặc định đã hoàn tất."</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Xóa thẻ SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Xóa tất cả dữ liệu trên bộ nhớ trong USB, chẳng hạn như nhạc hoặc ảnh"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc hoặc ảnh"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Xóa eSIM"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Xóa tất cả eSIM trên điện thoại. Thao tác này sẽ không hủy gói dịch vụ di động của bạn."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Xóa tất cả eSIM trên máy tính bảng. Thao tác này sẽ không hủy gói dịch vụ di động của bạn."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Đặt lại máy tính bảng"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Đặt lại điện thoại"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Xóa tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn? Bạn không thể hoàn tác thao tác này!"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1550,6 +1657,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Đang hoạt động"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Bộ nhớ USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Trên thẻ SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Đã tắt"</string>
     <string name="not_installed" msgid="2797554494953450291">"Chưa c.đặt cho người dùng này"</string>
     <string name="installed" msgid="3070865169422600098">"Đã cài đặt"</string>
     <string name="no_applications" msgid="7336588977497084921">"Không có ứng dụng nào."</string>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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">"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>
@@ -1873,6 +1986,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> dịch vụ in bật</item>
       <item quantity="one">1 dịch vụ in bật</item>
     </plurals>
+    <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> lệnh in</item>
+      <item quantity="one">1 lệnh in</item>
+    </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Dịch vụ in"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Chưa có dịch vụ nào được cài đặt"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"Không tìm thấy máy in"</string>
@@ -1939,6 +2056,46 @@
     <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>
+    <!-- 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">"Màn hình"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Đèn pin"</string>
     <string name="power_camera" msgid="4976286950934622605">"Máy ảnh"</string>
@@ -1953,7 +2110,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2163,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2654,17 +2814,20 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Ứng dụng mặc định"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Ngôn ngữ, thời gian, sao lưu, cập nhật"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Cài đặt"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Tìm kiếm cài đặt"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"Tìm kiếm cài đặt"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Cài đặt tìm kiếm"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"Cài đặt tìm kiếm"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, kết nối mạng"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"tin nhắn văn bản, nhắn tin, tin nhắn, nhắn"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"di động, thiết bị di động, nhà cung cấp dịch vụ di động, không dây, dữ liệu, 4g, 3g, 2g, lte"</string>
@@ -2709,6 +2872,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"cử chỉ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"thanh toán, nhấn, khoản thanh toán"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sao lưu"</string>
+    <!-- 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">"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>
@@ -2833,9 +3002,7 @@
     <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="manage_zen_access_title" msgid="2611116122628520522">"Không làm phiền"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Không có ứng dụng được cài đặt nào yêu cầu quyền truy cập Không làm phiền"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android đang chặn hiển thị các thông báo của ứng dụng này trên thiết bị này"</string>
@@ -2860,7 +3027,7 @@
     <string name="notification_content_block_title" msgid="5854232570963006360">"Hiển thị thông báo"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Không bao giờ hiển thị thông báo trong ngăn thông báo hoặc trên thiết bị ngoại vi"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"Cho phép dấu chấm thông báo"</string>
-    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Hiển thị dấu chấm thông báo"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Hiển thị dấu chấm thống báo"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ghi đè Không làm phiền"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Cho phép các thông báo này tiếp tục làm gián đoạn khi tính năng Không làm phiền được đặt thành Chỉ ưu tiên."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Trên màn hình khóa"</string>
@@ -2965,11 +3132,6 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Hồ sơ công việc này được quản lý bằng:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Quản lý bởi <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Thử nghiệm)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Xoay thiết bị"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Xoay các nội dung của màn hình"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Giữ nguyên chế độ xem dọc"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Giữ nguyên chế độ xem ngang"</string>
-    <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Giữ nguyên hướng hiện tại"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Khởi động an toàn"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tiếp tục"</string>
     <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mã PIN để khởi động thiết bị của bạn?"</string>
@@ -2977,7 +3139,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mã PIN để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu hình mở khóa để khởi động thiết bị của bạn?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn&gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Có"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"Không"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Yêu cầu mã PIN?"</string>
@@ -3062,7 +3224,7 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Không nhận dạng được"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Mặc định"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Mặc định cho công việc"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Trợ lý và nhập bằng giọng nói"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Trợ lý và nhập liệu"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Ứng dụng trợ lý"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Đặt <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> làm trợ lý của bạn?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Trợ lý sẽ có thể đọc thông tin về ứng dụng đang được sử dụng trên hệ thống của bạn, bao gồm thông tin hiển thị trên màn hình của bạn hoặc thông tin có thể truy cập trong ứng dụng."</string>
@@ -3095,6 +3257,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
@@ -3187,8 +3355,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"C.đặt ư.dụng ko xác định"</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>
@@ -3200,8 +3369,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Quyền sửa đổi cài đặt hệ thống của ứng dụng"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Cho phép sửa đổi cài đặt hệ thống"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Quyền này cho phép ứng dụng sửa đổi cài đặt hệ thống."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Có"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Không"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Cho phép từ nguồn này"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Xoắn đúp cho camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Mở ứng dụng camera bằng cách vặn cổ tay hai lần"</string>
@@ -3296,8 +3463,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 +3483,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>
@@ -3382,7 +3548,6 @@
     <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="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>
@@ -3447,28 +3612,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Tự động"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Hướng dẫn sử dụng"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Giải phóng dung lượng ngay"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Cử chỉ"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Phím tắt cử chỉ"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Cử chỉ nhanh để kiểm soát điện thoại"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Cử chỉ nhanh để điều khiển máy tính bảng của bạn"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Cử chỉ nhanh để điều khiển thiết bị của bạn"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Chuyển đến máy ảnh"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Để mở nhanh máy ảnh, hãy nhấn vào nút nguồn 2 lần. Hoạt động từ mọi màn hình."</string>
+    <!-- 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">"Chuyển máy ảnh"</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">"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>
+    <!-- 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">"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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Vuốt vân tay để xem thông báo"</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">"Vuốt dấu vân tay để xem thông báo"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau điện thoại."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau máy tính bảng."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau thiết bị."</string>
+    <!-- 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">"Nâng lên để mở máy ảnh"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Để tự động mở máy ảnh, hãy nhấc điện thoại vào vị trí chụp ảnh (ngang hoặc dọc). Hoạt động khi điện thoại của bạn ở chế độ ngủ hoặc bị khóa."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Chụp ảnh khi điện thoại ở chế độ ngủ hoặc bị khóa"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Cử chỉ hỗ trợ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Độ nhạy cảm"</string>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 1005c8a..cf3af7a 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"良好"</item>
     <item msgid="8986346415847956850">"极佳"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"始终"</item>
-    <item msgid="844721238536786870">"仅限充电时"</item>
-    <item msgid="1986753720941888596">"永不"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"始终"</item>
-    <item msgid="7433294150916905997">"仅限充电时"</item>
-    <item msgid="1390404486722375028">"永不"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"过去30天"</item>
     <item msgid="6600989128423965319">"设置流量周期…"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 64488cb..af4f300 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -23,13 +23,13 @@
     <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="other">现在只需再执行 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 步操作即可进入开发者模式。</item>
       <item quantity="one">现在只需再执行 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 步操作即可进入开发者模式。</item>
     </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 +41,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 +107,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">"您无权更改蓝牙设置。"</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> 上开启蓝牙设置后，附近的设备将可以检测到该设备。"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"更改解锁图案"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"更改解锁PIN码"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"更改解锁密码"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"请重试。您目前已尝试 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可尝试 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"最后一次尝试"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"如果您这次绘制的工作解锁图案仍然有误，您的工作资料和相关数据都将从此设备中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"如果您这次输入的工作 PIN 码仍然有误，您的工作资料和相关数据都将从此设备中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"如果您这次输入的工作密码仍然有误，您的工作资料和相关数据都将从此设备中移除。"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"错误次数过多。您的工作资料和相关数据将会从此设备中移除。"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"关闭"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"请重试。您目前已尝试 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可尝试 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"您的数据将遭到删除"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"如果您下次绘制的解锁图案仍然有误，系统将删除此设备上的数据"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"如果您下次输入的 PIN 码仍然有误，系统将删除此设备上的数据"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"如果您下次输入的密码仍然有误，系统将删除此设备上的数据"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"如果您下次绘制的解锁图案仍然有误，系统将删除此用户"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"如果您下次输入的 PIN 码仍然有误，系统将删除此用户"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"如果您下次输入的密码仍然有误，系统将删除此用户"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"如果您下次绘制的解锁图案仍然有误，系统将删除您的工作资料和相关数据"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"如果您下次输入的 PIN 码仍然有误，系统将删除您的工作资料和相关数据"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"如果您下次输入的密码仍然有误，系统将删除您的工作资料和相关数据"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"错误次数过多。系统将删除此设备上的数据。"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"错误次数过多。系统将删除此用户。"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"错误次数过多。系统将删除此工作资料和相关数据。"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"关闭"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"必须至少包含 <xliff:g id="COUNT">%d</xliff:g> 个字符"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN 码必须至少为 <xliff:g id="COUNT">%d</xliff:g> 位数"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"继续"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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">"WLAN 网络连接已断开。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>
@@ -810,7 +873,6 @@
       <item quantity="one">1 个网络</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"高级WLAN"</string>
-    <string name="wifi_configure_titlebar" msgid="7977475161589303074">"配置 WLAN"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC地址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 地址"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子网掩码"</string>
@@ -847,9 +909,28 @@
     <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>
+    <!-- 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_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">"正在打开热点..."</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 +977,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>
@@ -979,24 +1061,34 @@
     <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>
+    <!-- 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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1075,7 +1178,7 @@
     <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_info_not_available" msgid="8062521887156825182">"不可用"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"状态信息"</string>
     <string name="device_status" msgid="607405385799807324">"状态信息"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"电池状态、网络状态和其他信息"</string>
@@ -1102,7 +1205,7 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLANMAC 地址"</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_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>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN 不能为空。"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC 字段必须为 3 位数。"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC 字段必须为 2 位数或 3 位数。"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"运营商不允许添加“%s”类型的 APN。"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"正在恢复默认 APN 设置。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"重置为默认设置"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"已重置默认APN设置。"</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"格式化SD卡"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"清除该内部USB存储设备中的全部数据，例如音乐或照片"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除SD卡中的全部数据，例如音乐或照片"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"清空 eSIM 卡"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"清空手机上的所有 eSIM 卡。此操作并不会取消您的移动服务套餐。"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"清空平板电脑上的所有 eSIM 卡。此操作并不会取消您的移动服务套餐。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"恢复平板电脑出厂设置"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"恢复手机出厂设置"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"要清空您的所有个人信息和下载的应用吗？此操作无法撤消！"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"SD卡中"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"输入帮助"</string>
@@ -1873,6 +1986,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>
@@ -1901,7 +2018,7 @@
     <string name="power_usage_summary" msgid="7237084831082848168">"耗电情况"</string>
     <string name="power_usage_not_available" msgid="3109326074656512387">"没有电池使用数据。"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
-    <string name="power_discharge_remaining" msgid="4925678997049911808">"还可用：<xliff:g id="REMAIN">%1$s</xliff:g>"</string>
+    <string name="power_discharge_remaining" msgid="4925678997049911808">"电池剩余使用时间：<xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <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>
@@ -1939,6 +2056,46 @@
     <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>
@@ -1953,7 +2110,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">"CPU总使用时间"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持唤醒状态"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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="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>
@@ -2535,7 +2695,7 @@
     <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="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>
@@ -2654,17 +2814,20 @@
       <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>
     <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">"Wi-Fi, WLAN, 网络连接"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"短信, 信息, 发短信, 消息, 发送消息"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"移动网络, 移动, 手机运营商, 无线, 数据, 4G, 3G, 2G, LTE"</string>
@@ -2709,6 +2872,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">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"点按标签即可写入…"</string>
@@ -2833,8 +3002,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>
@@ -2904,8 +3071,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>
@@ -2965,11 +3132,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 +3139,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,13 +3257,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="other"><xliff:g id="NUMBER">%2$d</xliff:g> 个应用的行为异常</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</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="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>
@@ -3187,8 +3355,9 @@
     <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="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>
@@ -3200,8 +3369,6 @@
     <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_switch_title" msgid="3621381992793251070">"允许来自此来源的应用"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"扭转两次即可打开相机"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"扭转手腕两次即可打开相机应用"</string>
@@ -3296,8 +3463,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 +3483,7 @@
       <item quantity="one">已允许 1 个应用在流量节省程序开启时无限量使用数据流量。</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"流量节省程序"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"不受流量限制"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"不受流量限制"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"后台数据已关闭"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"开启"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"关闭"</string>
@@ -3378,11 +3544,10 @@
     <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_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="developer_smallest_width" msgid="7516950434587313360">"最小宽度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"没有任何已安装的应用申请付费短信权限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"“付费短信”可能会产生费用，而且相关费用将计入您的运营商帐单。如果您为某个应用启用该权限，那么您将能够使用该应用发送付费短信。"</string>
@@ -3447,28 +3612,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>
+    <!-- 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 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>
@@ -3572,6 +3764,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 +3778,10 @@
     <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>
+    <!-- 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-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 4cb0452..ba1fe3a 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"強"</item>
     <item msgid="8986346415847956850">"非常強"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"永遠"</item>
-    <item msgid="844721238536786870">"只在充電時"</item>
-    <item msgid="1986753720941888596">"永不"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"永遠"</item>
-    <item msgid="7433294150916905997">"只在充電時"</item>
-    <item msgid="1390404486722375028">"永不"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"最近 30 天"</item>
     <item msgid="6600989128423965319">"設定用量週期…"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e502fc7..278609b 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -23,13 +23,13 @@
     <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="other">您只需完成 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
       <item quantity="one">您只需完成 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
     </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 +41,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 +107,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">"您沒有變更藍牙設定的權限。"</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>。"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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,7 +175,12 @@
     <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="date_and_time" msgid="9062980487860757694">"日期和時間"</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) -->
     <skip />
@@ -281,8 +304,8 @@
     <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>
@@ -329,7 +352,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 +377,55 @@
     <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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"更改解鎖圖形"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"請再試一次。您已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"最後一次機會"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"如果您這次畫出錯誤的工作解鎖圖案，工作設定檔和相關資料將從這部裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"如果您這次輸入錯誤的工作 PIN 碼，工作設定檔和相關資料將從這部裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"如果您這次輸入錯誤的工作密碼，工作設定檔和相關資料將從這部裝置中移除。"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"輸入錯誤的次數太多。您的工作設定檔和相關資料將從這部裝置中移除。"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"關閉"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"請再試一次。您已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"您的資料將會刪除"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除此裝置上的資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"如果您下次輸入錯誤的 PIN，系統將會刪除此裝置上的資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"如果您下次輸入錯誤的密碼，系統將會刪除此裝置上的資料"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除此使用者"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"如果您下次輸入錯誤的 PIN，系統將會刪除此使用者"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"如果您下次輸入錯誤的密碼，系統將會刪除此使用者"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除工作設定檔和相關資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"如果您下次輸入錯誤的 PIN，系統將會刪除工作設定檔和相關資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"如果您下次輸入錯誤的密碼，系統將會刪除工作設定檔和相關資料"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"輸入錯誤的次數太多，系統將會刪除此裝置上的資料。"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"輸入錯誤的次數太多，系統將會刪除此使用者。"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"輸入錯誤的次數太多，系統將會刪除此工作設定檔和相關資料。"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"關閉"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"必須至少有 <xliff:g id="COUNT">%d</xliff:g> 個字元"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN 必須至少有 <xliff:g id="COUNT">%d</xliff:g> 個數字"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"網絡名稱"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"輸入 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"正在開啟熱點…"</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 +977,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>
@@ -979,24 +1061,34 @@
     <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>
+    <!-- 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>
-    <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1268,12 +1371,13 @@
     <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 類型的 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>
@@ -1303,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"清除 SD 記憶卡資料"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"清除內部 USB 儲存裝置中的所有資料，例如音樂或相片"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 SD 記憶卡中的所有資料，例如音樂或相片"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"清除 eSIM 卡"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"清除手機上的所有 eSIM。此操作不會取消您的流動服務計劃。"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"清除平板電腦上的所有 eSIM。此操作不會取消您的流動服務計劃。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重設平板電腦"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"您要清除所有個人資訊和已下載的應用程式嗎？您無法復原這項操作！"</string>
@@ -1325,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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,7 +1478,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>
@@ -1492,6 +1593,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1538,9 +1645,9 @@
     <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>
@@ -1551,6 +1658,7 @@
     <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="default" msgid="1477351142334784771">"於 SD 卡"</string>
+    <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>
@@ -1660,6 +1768,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"輸入協助"</string>
@@ -1874,6 +1987,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>
@@ -1940,6 +2057,46 @@
     <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>
@@ -1954,7 +2111,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">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持啟用"</string>
@@ -2006,6 +2164,8 @@
     <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>
+    <!-- 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="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>
@@ -2510,7 +2670,7 @@
     <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_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>
@@ -2559,7 +2719,7 @@
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"設定付款應用程式，然後將機背對準任何終端機的非接觸式符號。"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"知道了"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"更多…"</string>
-    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"設為您的偏好設定？"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"設為您的喜好設定？"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"每次使用 Tap &amp; Pay 時都使用<xliff:g id="APP">%1$s</xliff:g>？"</string>
     <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"每次使用 Tap &amp; Pay 時都使用<xliff:g id="APP_0">%1$s</xliff:g> (而非<xliff:g id="APP_1">%2$s</xliff:g>)？"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
@@ -2567,14 +2727,14 @@
     <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="8276116616493882830">"說明文章、手機和即時通訊支援"</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>
     <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="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>
@@ -2657,9 +2817,12 @@
       <item quantity="one">顯示 %d 個隱藏項目</item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"網絡和互聯網"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi、流動裝置、數據用量、熱點"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"流動網絡"</string>
+    <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
+    <string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"熱點"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"已連結的裝置"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"藍牙、投放、NFC"</string>
+    <string name="connected_devices_dashboard_no_nfc_summary" msgid="9106040742715366495">"藍牙、投放"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"權限、預設應用程式"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"使用者和帳戶"</string>
@@ -2712,6 +2875,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>
@@ -2807,7 +2976,7 @@
     <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="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>
@@ -2836,8 +3005,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,9 +3029,9 @@
     <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_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>
@@ -2968,11 +3135,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 +3142,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>
@@ -3047,7 +3209,7 @@
     <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>
@@ -3098,9 +3260,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>
+    <!-- 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_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>
@@ -3130,7 +3298,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,11 +3355,12 @@
     <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_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="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>
@@ -3203,8 +3372,6 @@
     <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_switch_title" msgid="3621381992793251070">"允許此來源的應用程式"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"轉動兩下即可使用相機功能"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"轉動手腕兩下即可開啟相機應用程式"</string>
@@ -3228,7 +3395,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,7 +3445,7 @@
     <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="suggestion_remove" msgid="904627293892092439">"移除"</string>
@@ -3299,8 +3466,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 +3486,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,7 +3551,6 @@
     <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">"沒有已安裝的應用程式要求發送付費短訊的權限"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"付費短訊的費用可能高昂，並會增加您流動網絡供應商帳單的款項。如果您為應用程式開放權限，將可以透過該應用程式發送付費短訊。"</string>
@@ -3450,28 +3615,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>
+    <!-- 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>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"輕按兩下以查看手機"</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>
+    <!-- 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>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"在指紋感應器滑動以查看通知"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"在手機背面的指紋感應器向下快速滑動，即可查看通知。"</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">"快速滑動指紋以查看通知"</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>
@@ -3575,6 +3767,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 +3781,10 @@
     <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>
+    <!-- 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-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 7d52a49..181ea93 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"良好"</item>
     <item msgid="8986346415847956850">"極佳"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"一律"</item>
-    <item msgid="844721238536786870">"僅限充電時"</item>
-    <item msgid="1986753720941888596">"永不"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"一律"</item>
-    <item msgid="7433294150916905997">"僅限充電時"</item>
-    <item msgid="1390404486722375028">"永不採用"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"最近 30 天"</item>
     <item msgid="6600989128423965319">"設定用量週期..."</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ed2077f..42bae20 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -23,13 +23,13 @@
     <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="other">你只需完成剩餘的 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
       <item quantity="one">你只需完成剩餘的 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
     </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 +41,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 +107,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">"你沒有變更藍牙設定的權限。"</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>」。"</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>
@@ -121,7 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,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) -->
@@ -329,7 +352,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 +377,55 @@
     <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>
@@ -449,6 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"變更解鎖圖案"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"請再試一次。你目前已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"最後一次機會"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"如果你這次畫出的 Work 解鎖圖案錯誤，你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"如果你這次輸入的 Work PIN 碼錯誤，你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"如果你這次輸入的 Work 密碼錯誤，你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"輸入錯誤次數過多。你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"關閉"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"請再試一次。你目前已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"你的資料將遭到刪除"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"如果下次輸入的解鎖圖案仍不正確，系統將刪除這個裝置中的資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"如果下次輸入的 PIN 碼仍不正確，系統將刪除這個裝置中的資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"如果下次輸入的密碼仍不正確，系統將刪除這個裝置中的資料"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"如果下次輸入的解鎖圖案仍不正確，系統將刪除這位使用者"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"如果下次輸入的 PIN 碼仍不正確，系統將刪除這位使用者"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"如果下次輸入的密碼仍不正確，系統將刪除這位使用者"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"如果下次輸入的解鎖圖案仍不正確，系統將刪除你的 Work 設定檔和相關資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"如果下次輸入的 PIN 碼仍不正確，系統將刪除你的 Work 設定檔和相關資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"如果下次輸入的密碼仍不正確，系統將刪除你的 Work 設定檔和相關資料"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"錯誤次數過多，系統將刪除這個裝置中的資料。"</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"錯誤次數過多，系統將刪除這位使用者。"</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"錯誤次數過多，系統將刪除這個 Work 設定檔和相關資料。"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"關閉"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"必須包含至少 <xliff:g id="COUNT">%d</xliff:g> 個字元"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN 碼至少要有 <xliff:g id="COUNT">%d</xliff:g> 位數字"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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>
@@ -747,7 +811,6 @@
     <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_ssid" msgid="5519636102673067319">"網路名稱"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"輸入 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"正在開啟無線基地台…"</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 +977,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>
@@ -980,23 +1062,33 @@
     <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_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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>
@@ -1020,8 +1112,19 @@
     <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>
+    <!-- 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>
@@ -1273,6 +1376,7 @@
     <string name="error_apn_empty" msgid="4932211013600863642">"APN 不可留空。"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC 欄位必須為 3 位數。"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC 欄位必須要有 2 或 3 位數。"</string>
+    <string name="error_adding_apn_type" msgid="4181334016628549645">"電信業者不允許新增「%s」類型的 APN。"</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"正在還原預設 APN 設定。"</string>
     <string name="menu_restore" msgid="8260067415075573273">"還原為預設狀態"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"重設預設 APN 設定已完成。"</string>
@@ -1302,6 +1406,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"清除 SD 卡"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"清除內部 USB 儲存裝置中的所有資料，例如音樂或相片"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 SD 卡中的所有資料，例如音樂或相片。"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"清除 eSIM 卡"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"清除手機上的所有 eSIM 卡。這項操作不會導致你現有的行動服務方案取消。"</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"清除平板電腦上的所有 eSIM 卡。這項操作不會導致你的行動服務方案取消。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重設平板電腦"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"你要清除所有個人資訊和已下載的應用程式嗎？這個動作無法復原！"</string>
@@ -1324,26 +1431,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1477,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>
@@ -1491,6 +1592,12 @@
     <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 recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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>
@@ -1550,6 +1657,7 @@
     <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="default" msgid="1477351142334784771">"於 SD 卡"</string>
+    <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>
@@ -1659,6 +1767,11 @@
     <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>
+    <!-- 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>
     <string name="input_assistance" msgid="7577795275222555487">"輸入輔助"</string>
@@ -1756,7 +1869,7 @@
     <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="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 +1986,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>
@@ -1908,7 +2025,7 @@
     <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>
@@ -1933,12 +2050,52 @@
     <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="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>
+    <!-- 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>
@@ -1953,7 +2110,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">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前景使用時間"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"停用休眠"</string>
@@ -2005,6 +2163,8 @@
     <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>
+    <!-- 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="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>
@@ -2027,7 +2187,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android 作業系統"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"應用程式最佳化"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"節約耗電量模式"</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_pct" msgid="8665950426992057191">"電量為 <xliff:g id="PERCENT">%1$s</xliff:g> 時"</string>
@@ -2658,9 +2818,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>
@@ -2669,7 +2832,7 @@
     <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_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>
@@ -2713,6 +2876,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>
@@ -2837,8 +3006,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>
@@ -2969,11 +3136,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 +3143,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 +3261,12 @@
     <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>
+    <!-- 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>
@@ -3191,8 +3359,9 @@
     <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="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>
@@ -3204,8 +3373,6 @@
     <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_switch_title" msgid="3621381992793251070">"允許這個來源的應用程式"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"扭兩下即可開啟相機"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"扭動手腕兩次即可開啟「相機」應用程式"</string>
@@ -3213,7 +3380,7 @@
     <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_make_smaller_desc" msgid="4622359904253364742">"縮小"</string>
@@ -3300,8 +3467,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 +3487,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>
@@ -3386,7 +3552,6 @@
     <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">"沒有任何已安裝的應用程式要求「付費簡訊」存取權"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"「付費簡訊」需要額外計費，相關費用會併入你的電信費帳單。如果你為某個應用程式啟用權限，即可利用該應用程式傳送付費簡訊。"</string>
@@ -3397,7 +3562,7 @@
     <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_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>
@@ -3451,28 +3616,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>
+    <!-- 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>
+    <!-- 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 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>
@@ -3576,10 +3768,11 @@
     <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_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="default_theme" msgid="7085644992078579076">"預設"</string>
@@ -3589,5 +3782,10 @@
     <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>
+    <!-- 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-zu/arrays.xml b/res/values-zu/arrays.xml
index 1e2e285..df1e995 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -145,16 +145,6 @@
     <item msgid="6019931571712517411">"Kuhle"</item>
     <item msgid="8986346415847956850">"Kuhle kakhulu"</item>
   </string-array>
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Njalo"</item>
-    <item msgid="844721238536786870">"Uma ixhunyiwe kuphela"</item>
-    <item msgid="1986753720941888596">"Akusoze"</item>
-  </string-array>
-  <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"Njalo"</item>
-    <item msgid="7433294150916905997">"Uma ixhunyiwe kuphela"</item>
-    <item msgid="1390404486722375028">"Akusoze"</item>
-  </string-array>
   <string-array name="data_usage_data_range">
     <item msgid="5013973108901348144">"Izinsuku zokugcina ezingu-30"</item>
     <item msgid="6600989128423965319">"Isetha umjikelezo wokusebenzisa..."</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index eac0180..9e03935 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -23,13 +23,13 @@
     <string name="deny" msgid="6947806159746484865">"Nqaba"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Vala"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Shintshela"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Akwaziwa"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Manje ususele ngamagxathu angu-<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ukuthi ube ngunjiniyela.</item>
       <item quantity="other">Manje ususele ngamagxathu angu-<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ukuthi ube ngunjiniyela.</item>
     </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 +41,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 +107,26 @@
     <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>
+    <!-- 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">"Awunayo imvume yokushintsha izilungiselelo ze-Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- 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">"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 +138,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +175,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Amadivayisi akho"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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 +352,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 +377,55 @@
     <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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- 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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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 +487,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 +559,21 @@
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Shintsha iphathini yokuvula"</string>
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Shintsha i-PIN yokuvula"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Shintsha iphasiwedi yokuvula"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"Zama futhi. Umzamo <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kwengu-<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
-    <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"Umzamo wokugcina"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"Uma ufaka iphethini yomsebenzi engalungile kulo mzamo, iphrofayela yakho yomsebenzi kanye nedatha ephathelanisiwe kuzosuswa kusuka kule divayisi."</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"Uma ufaka iphini yomsebenzi engalungile kulo mzamo, iphrofayela yakho yomsebenzi kanye nedatha ephathelene kuzosuswa kusuka kule divayisi."</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"Uma iphasiwedi yomsebenzi engalungile kulo mzamo, iphrofayela yakho yomsebenzi nedatha ephathelanisiwe izosuswa kusuka kule divayisi."</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"Imizamo eminingi engalungile. Iphrofayela yakho yomsebenzi kanye nedatha ephathelanisiwe kuzosuswa kusuka kule divayisi."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"Cashisa"</string>
+    <string name="lock_failed_attempts_before_wipe" msgid="2219711062197089783">"Zama futhi. Umzamo ongu-<xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> kwengu-<xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
+    <string name="lock_last_attempt_before_wipe_warning_title" msgid="4277765862798876826">"Idatha yakho izosuswa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_device" msgid="4999108263936246210">"Uma ufaka iphethini engalungile kumzamo olandelayo, le datha yamadivayisi izosuswa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="2191214314973933300">"Uma ufaka iphinikhodi engalungile kumzamo olandelayo, le datha yalawa madivayisi izosuswa"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6526655065466746563">"Uma ufake iphasiwedi engalungile kumzamo olandelayo, le datha yalawa madivayisi izosuswa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_user" msgid="7851504071368235547">"Uma ufaka iphethini engalungile kumzamo olandelayo, lo msebenzisi uzosuswa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_user" msgid="4049024921333961715">"Uma ufaka iphinikhodi engalungile kumzamo olandelayo, lo msebenzisi uzosuswa"</string>
+    <string name="lock_last_password_attempt_before_wipe_user" msgid="4660886542496781672">"Uma ufaka iphasiwedi engalungile kumzamo olandelayo, lo msebenzisi uzosuswa"</string>
+    <string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2437716252059050291">"Uma ufaka iphethini engalungile kumzamo olandelayo, iphrofayela yakho yomsebenzi nedatha yayo izosuswa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_profile" msgid="5799931839127476913">"Uma ufaka iphinikhodi engalungile kumzamo olandelayo, iphrofayela yakho yomsebenzi nedatha yayo izosuswa"</string>
+    <string name="lock_last_password_attempt_before_wipe_profile" msgid="6786586046975042158">"Uma ufake iphasiwedi engalungile kumzamo olandelayo, iphrofayela yakho yomsebenzi nedatha yayo izosuswa"</string>
+    <string name="lock_failed_attempts_now_wiping_device" msgid="1951676829299522277">"Imizamo eminingi kakhulu engalungile. Le datha yedivayisi izosuswa."</string>
+    <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"Imizamo eminingi kakhulu engalungile. Lo msebenzisi uzosuswa."</string>
+    <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"Imizamo eminingi kakhulu engalungile. Le phrofayela yomsebenzi nedatha yayo izosuswa."</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Cashisa"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Kumele okungenani kube izinhlamvu ezingu-<xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"Iphinikhodi kumele ibe okungenani amadijithi angu-<xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Qhubeka"</string>
@@ -626,6 +674,22 @@
     <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>
+    <!-- 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">"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>
@@ -747,7 +811,6 @@
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Izilungiselelo zokuphepha zendlela engenazintambo (TKIP) azisekelwe"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ukwehluleka kokugunyazwa. Sicela uzame futhi."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Esinye isikhathi se-WPS sitholiwe. Sicela uzame futhi emaminithini ambalwa."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"I-Wi‑Fi inqamukile. Ukusetha kwe-WPS kukhanseliwe."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Igama lenethiwekhi"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Faka i-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ukuphepha"</string>
@@ -810,7 +873,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 +909,28 @@
     <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>
+    <!-- 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_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">"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 +977,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>
@@ -980,23 +1062,33 @@
     <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>
+    <!-- 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">"Isikhathi sokuqala"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Isikhathi sokuphela"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
     <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>
+    <!-- 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">"Vuliwe / <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">"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 +1112,19 @@
     <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>
+    <!-- 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">"Vusa isikrini uma uthola izaziso"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Njalo ivuliwe"</string>
+    <string name="doze_always_on_summary" msgid="1254238982577776475">"Isikhathi sokubonisa, izithonjana zesazsizo, nolunye ulwazi"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Yenza umbhalo ube mkhulu noma ube mncane"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Izilungiselelo zokuvala ikhadi le-SIM"</string>
@@ -1274,6 +1377,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>
@@ -1303,6 +1407,9 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Sula ikhadi le-SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Sula yonke idatha ekusitoreji se-USB , njengomculo noma izithombe."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Sula yonke idatha ekhadini le-SD, njengomculo noma izithombe"</string>
+    <string name="erase_esim_storage" msgid="1886761972867390123">"Sula ama-eSIMs"</string>
+    <string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Sula onke ama-eSIMs efonini. Lokhu ngeke kukhansele icebo lakho lesevisi yeselula."</string>
+    <string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Sula onke ama-eSIMs kuthebhulethi. Lokhu ngeke kukhansele icebo lakho lesevisi yeselula."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setha kabusha ithebhulethi"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setha kabusha ifoni"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Sula lonke ulwazi lakho lomuntu siqu kanye nezinhlelo zokusebenza ezilandiwe? Awukwazi ukuhlehlisa lesi senzo!"</string>
@@ -1325,26 +1432,20 @@
     <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>
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
+    <skip />
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
+    <skip />
     <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>
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
+    <skip />
     <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 +1478,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>
@@ -1492,6 +1593,12 @@
     <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>
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- 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">"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>
@@ -1551,6 +1658,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Sebenzayo"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Isitoreji se-USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Ekhadini le-SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Akusebenzi"</string>
     <string name="not_installed" msgid="2797554494953450291">"Akufakiwe kulo msebenzisi"</string>
     <string name="installed" msgid="3070865169422600098">"Kufakiwe"</string>
     <string name="no_applications" msgid="7336588977497084921">"Azikho izinhlelo zokusebenza"</string>
@@ -1660,6 +1768,11 @@
     <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>
+    <!-- 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">"Izilimi nokokufaka"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Izilimi nokokufaka"</string>
     <string name="input_assistance" msgid="7577795275222555487">"Usizo lokufakwa"</string>
@@ -1874,6 +1987,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 +2057,46 @@
     <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>
+    <!-- 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">"Isikrini"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"I-Flashlight"</string>
     <string name="power_camera" msgid="4976286950934622605">"Ikhamera"</string>
@@ -1954,7 +2111,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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,6 +2164,8 @@
     <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>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
     <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>
@@ -2655,16 +2815,19 @@
       <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Izinhlelo zokusebenza ezizenzakalelayo"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Izilimi, isikhathi, isipele, izibuyekezo"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Izilungiselelo"</string>
-    <string name="search_menu" msgid="6283419262313758339">"Sesha izilungiselelo"</string>
+    <string name="search_menu" msgid="6283419262313758339">"Izilungiselelo zokusesha"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Izilungiselelo zokusesha"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"i-wifi, i-wi-fi, ukuxhumeka kwenethiwekhi"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"umlayezo wombhalo, ukuthumela umlayezo, imilayezo, ukulayeza"</string>
@@ -2710,6 +2873,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"ukuthinta"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"khokha, thepha, i-payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"isipele, yenza isipele"</string>
+    <!-- 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">"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>
@@ -2834,8 +3003,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>
@@ -2966,11 +3133,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 +3140,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 +3258,12 @@
     <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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 +3356,9 @@
     <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="install_other_apps" msgid="6986686991775883017">"Faka izinhlelo zokusebenza ezingaziwa"</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>
@@ -3201,8 +3370,6 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Imvume yezilungiselelo zesistimu zokushintsha zohlelo lokusebenza"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Vumela ukushintsha izilungiselelo zesistimu"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Le mvume ivumela uhlelo lokusebenza ukushintsha izilungiselelo zesistimu."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Yebo"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Cha"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"Vumela kusukela kulo mthombo"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Shinthsa kabili ingalo ukuze uthole ikhamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Vula uhlelo lokusebenza lekhamera ngokushintsha ingalo yakho kabili"</string>
@@ -3297,8 +3464,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 +3484,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>
@@ -3383,7 +3549,6 @@
     <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="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>
@@ -3448,28 +3613,55 @@
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Okuzenzakalelayo"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Okwenziwa ngesandla"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Khulula isikhala manje"</string>
-    <string name="gesture_preference_title" msgid="5280023307132819052">"Ukuthinta"</string>
+    <string name="gesture_preference_title" msgid="4033736910560673690">"Izinqamuleli zokuthinta"</string>
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Ukuthinta okusheshayo ukulawula ifoni yakho"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Ukuthinta okusheshayo kokulawula ithebhulethi yakho"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Ukuthinta okusheshayo ukulawula idivayisi yakho"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Yeqela kukhamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Ukuze uvule ngokushesha ikhamera yakho, cindezela inkinobho yamandla kabili. Isebenza kusukela kunoma isiphi isikrini."</string>
+    <!-- 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">"Jikisa ikhamera"</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">"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>
+    <!-- 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">"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>
+    <!-- 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">"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>
+    <!-- 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">"Phakama ukuze uvule ikhamera"</string>
+    <string name="camera_lift_trigger_summary" msgid="8580625412416846375">"Ukuze uvule ikhamera ngokuzenzakalela, phakamisa ifoni yakho iye kusimo sokuthatha isithombe (ukwakheka kwezwe noma ukuma ngobude). Isebenza uma ifoni yakho ilele noma ikhiyiwe."</string>
+    <string name="camera_lift_trigger_suggestion_summary" msgid="7209899898244722404">"Thatha izithombe uma ifoni ilele noma ikhiyiwe"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Ukuthinta komsizi"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Ukuzwela"</string>
@@ -3573,6 +3765,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 +3779,10 @@
     <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>
+    <!-- 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/arrays.xml b/res/values/arrays.xml
index 873576c..5e1a468 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -326,38 +326,6 @@
         <item>Excellent</item>
     </string-array>
 
-    <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
-    <string-array name="wifi_sleep_policy_entries">
-        <!-- Always keep Wi-Fi on when screen turns off. -->
-        <item>Always</item>
-        <!-- Keep Wi-Fi on when screen turns off and plugged in.  When on battery, go to sleep when screen turns off. -->
-        <item>Only when plugged in</item>
-        <!-- Do not keep Wi-Fi on when screen turns off.  [CHAR LIMIT=40] -->
-        <item>Never</item>
-    </string-array>
-
-    <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
-         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
-    <string-array name="wifi_sleep_policy_entries_wifi_only">
-        <!-- Always keep Wi-Fi on when screen turns off. -->
-        <item>Always</item>
-        <!-- Keep Wi-Fi on when screen turns off and plugged in.  When on battery, go to sleep when screen turns off. -->
-        <item>Only when plugged in</item>
-        <!-- Do not keep Wi-Fi on when screen turns off, for Wi-Fi-only devices, no other data connection -->
-        <item>Never</item>
-    </string-array>
-
-    <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. --> <skip />
-    <!-- Do not translate. -->
-    <string-array name="wifi_sleep_policy_values">
-        <!-- Do not translate. -->
-        <item>2</item>
-        <!-- Do not translate. -->
-        <item>1</item>
-        <!-- Do not translate. -->
-        <item>0</item>
-    </string-array>
-
     <!-- Data Usage settings. Range of data usage. -->
     <string-array name="data_usage_data_range">
         <!-- Last 30 days [CHAR LIMIT=25]-->
@@ -1056,4 +1024,18 @@
         <item>90</item>
     </string-array>
 
+    <string-array name="when_to_start_screensaver_entries" translatable="false">
+        <item>@string/screensaver_settings_summary_sleep</item>
+        <item>@string/screensaver_settings_summary_dock</item>
+        <item>@string/screensaver_settings_summary_either_long</item>
+        <item>@string/screensaver_settings_summary_never</item>
+    </string-array>
+
+    <string-array name="when_to_start_screensaver_values" translatable="false">
+        <item>while_charging_only</item>
+        <item>while_docked_only</item>
+        <item>either_charging_or_docked</item>
+        <item>never</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9f87d03..acb6ec3 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -94,6 +94,10 @@
 
     <attr name="footerPreferenceStyle" format="reference" />
 
+    <declare-styleable name="FixedLineSummaryPreference">
+        <attr name="summaryLineCount" format="integer" />
+    </declare-styleable>
+
     <!-- For Search -->
     <declare-styleable name="Preference">
         <attr name="keywords" format="string" />
@@ -155,7 +159,16 @@
     </declare-styleable>
 
     <declare-styleable name="TintablePreference">
-        <attr name="android:tint" format="color|reference"/>
+        <attr name="android:tint" format="color|reference" />
+    </declare-styleable>
+
+    <!-- For UsageView -->
+    <declare-styleable name="UsageView">
+        <attr name="android:colorAccent" />
+        <attr name="sideLabels" format="reference" />
+        <attr name="bottomLabels" format="reference" />
+        <attr name="textColor" format="color" />
+        <attr name="android:gravity" />
     </declare-styleable>
 
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ef85925..3e80ab4 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 f81bf9b..f1d6923 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 c8737b9..af20217 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 b77f4b5..b207009 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -43,6 +43,9 @@
     <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
     <string name="show_dev_already">No need, you are already a developer.</string>
 
+    <!-- [CHAR LIMIT=NONE] Toast message when user attemps to launch developer otions before enabling it. -->
+    <string name="dev_settings_disabled_warning">Please enable developer options first.</string>
+
     <!-- Category headings in left-pane header menu --> <skip />
     <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
     <string name="header_category_wireless_networks">Wireless &amp; networks</string>
@@ -71,6 +74,9 @@
     <!-- Wifi Calling provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="wfc_provisioned_switch_string">Wifi Calling Provisioned</string>
 
+    <!-- EAB provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+    <string name="eab_provisioned_switch_string">EAB/Presence Provisioned</string>
+
     <!-- Title for controlling on/off for Mobile phone's radio power. Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="radio_info_radio_power">Mobile Radio Power</string>
 
@@ -235,15 +241,30 @@
     <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
     <string name="bluetooth_rename_button">Rename</string>
     <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
-    <string name="bluetooth_disconnect_title">Disconnect?</string>
+    <string name="bluetooth_disconnect_title">Disconnect device?</string>
     <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
-    <string name="bluetooth_disconnect_all_profiles">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>
+    <string name="bluetooth_disconnect_all_profiles" product="default">Your phone will disconnect from "<xliff:g id="device_name">%1$s</xliff:g>."</string>
+    <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disconnect_all_profiles" product="tablet">Your tablet will disconnect from "<xliff:g id="device_name">%1$s</xliff:g>."</string>
+    <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_disconnect_all_profiles" product="device">Your device will disconnect from "<xliff:g id="device_name">%1$s</xliff:g>."</string>
+    <!-- dialog ok button for disconnect dialog [CHAR LIMIT=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>
 
-    <!-- Title text for ambient display pick up (phone) [CHAR LIMIT=60]-->
+    <!-- Summary for settings suggestion for double tap power for camera [CHAR LIMIT=60] -->
+    <string name="ambient_display_suggestion_summary">Check notifications when screen is off</string>
+
+    <!-- Preference and settings suggestion title text for ambient display pick up (phone) [CHAR LIMIT=60]-->
     <string name="ambient_display_pickup_title" product="default">Lift to check phone</string>
-    <!-- Title text for ambient display pick up (tablet) [CHAR LIMIT=60]-->
+    <!-- Preference and settings suggestion title text for ambient display pick up (tablet) [CHAR LIMIT=60]-->
     <string name="ambient_display_pickup_title" product="tablet">Lift to check tablet</string>
-    <!-- Title text for ambient display pick up (device) [CHAR LIMIT=60]-->
+    <!-- Preference and settings suggestion title text for ambient display pick up (device) [CHAR LIMIT=60]-->
     <string name="ambient_display_pickup_title" product="device">Lift to check device</string>
 
-    <!-- Summary text for ambient display (phone) [CHAR LIMIT=160]-->
-    <string name="ambient_display_pickup_summary" product="default">To quickly check your notifications, pick up your phone.</string>
-    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=160]-->
-    <string name="ambient_display_pickup_summary" product="tablet">To quickly check your notifications, pick up your tablet.</string>
-    <!-- Summary text for ambient display (device) [CHAR LIMIT=160]-->
-    <string name="ambient_display_pickup_summary" product="device">To quickly check your notifications, pick up your device.</string>
+    <!-- Summary text for ambient display (phone) [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_pickup_summary" product="default">To check time, notification icons, and other info, pick up your phone.</string>
+    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_pickup_summary" product="tablet">To check time, notification icons, and other info, pick up your tablet.</string>
+    <!-- Summary text for ambient display (device) [CHAR LIMIT=NONE]-->
+    <string name="ambient_display_pickup_summary" product="device">To check time, notification icons, and other info, pick up your device.</string>
+
+    <!-- Summary for settings suggestion for ambient display pick up [CHAR LIMIT=60] -->
+    <string name="ambient_display_pickup_suggestion_summary">Check notifications when screen is off</string>
 
     <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
     <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
@@ -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 bae36b3..fee7c74 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 d9124c5..8b5e7d3 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 3dbaa8b..0b883e4 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -22,7 +22,7 @@
     <attr name="side_margin" format="reference|dimension" />
     <attr name="wifi_signal_color" format="reference" />
 
-    <style name="SetupWizardTheme" parent="SuwThemeGlif">
+    <style name="GlifTheme" parent="SuwThemeGlif">
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
         <item name="android:colorPrimary">@color/suw_color_accent_dark</item>
@@ -43,7 +43,7 @@
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
     </style>
 
-    <style name="SetupWizardTheme.Light" parent="SuwThemeGlif.Light">
+    <style name="GlifTheme.Light" parent="SuwThemeGlif.Light">
         <!-- For all Alert Dialogs -->
         <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
         <item name="android:colorPrimary">@color/suw_color_accent_light</item>
@@ -63,14 +63,55 @@
         <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
     </style>
 
-    <style name="SetupWizardTheme.Transparent" parent="SetupWizardTheme">
+    <style name="GlifV2Theme" parent="SuwThemeGlifV2">
+        <!-- For all Alert Dialogs -->
+        <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
+        <item name="android:colorPrimary">@color/suw_color_accent_dark</item>
+        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="setup_divider_color">@color/setup_divider_color_dark</item>
+        <item name="side_margin">0dip</item>
+        <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
+        <item name="wifi_friction">@drawable/wifi_friction</item>
+        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
+
+        <!-- LockPatternView colors -->
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
+    </style>
+
+    <style name="GlifV2Theme.Light" parent="SuwThemeGlifV2.Light">
+        <!-- For all Alert Dialogs -->
+        <item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
+        <item name="android:colorPrimary">@color/suw_color_accent_light</item>
+        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
+        <item name="ic_wps">@drawable/ic_wps_light</item>
+        <item name="setup_divider_color">@color/setup_divider_color_light</item>
+        <item name="side_margin">0dip</item>
+        <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
+        <item name="wifi_friction">@drawable/wifi_friction</item>
+        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
+        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
+
+        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
+    </style>
+
+    <style name="SetupWizardTheme.Transparent" parent="GlifTheme">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowAnimationStyle">@null</item>
     </style>
 
-    <style name="SetupWizardTheme.Light.Transparent" parent="SetupWizardTheme.Light">
+    <style name="SetupWizardTheme.Light.Transparent" parent="GlifTheme.Light">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
@@ -165,6 +206,12 @@
         <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.SubSettings</item>
     </style>
 
+    <!-- Variant of the settings theme with no action bar. -->
+    <style name="Theme.Settings.NoActionBar">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
     <style name="Theme.ProvisioningActivity" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowIsTranslucent">true</item>
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index f774335..6bd6c4d 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -18,7 +18,7 @@
                   android:title="@string/accessibility_autoclick_preference_title">
 
 
-    <com.android.settings.SeekBarPreference
+    <com.android.settings.widget.SeekBarPreference
         android:key="autoclick_delay"
         android:title="@string/accessibility_autoclick_delay_preference_title"/>
 
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index 9f08400..9b553ac 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -17,12 +17,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/accessibility_display_daltonizer_preference_title" >
 
-    <Preference
-        android:summary="@string/accessibility_display_daltonizer_preference_subtitle"
-        android:layout="@layout/text_description_preference"
-        android:persistent="false"
-        android:selectable="false" />
-
     <ListPreference
         android:entries="@array/daltonizer_type_entries"
         android:entryValues="@array/daltonizer_type_values"
diff --git a/res/xml/account_type_settings.xml b/res/xml/account_type_settings.xml
index ab997a5..7f57ed0 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 0000000..47fed8a
--- /dev/null
+++ b/res/xml/ambient_display_settings.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/ambient_display_screen_title">
+
+    <PreferenceCategory
+            android:title="@string/ambient_display_category_triggers">
+
+        <SwitchPreference
+            android:key="ambient_display_always_on"
+            android:title="@string/doze_always_on_title"
+            android:summary="@string/doze_always_on_summary" />
+
+        <Preference
+            android:key="ambient_display_double_tap"
+            android:title="@string/ambient_display_title"
+            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />
+
+        <Preference
+            android:key="ambient_display_pick_up"
+            android:title="@string/ambient_display_pickup_title"
+            android:fragment="com.android.settings.gestures.PickupGestureSettings" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory>
+
+        <SwitchPreference
+            android:key="ambient_display_notification"
+            android:title="@string/doze_title"
+            android:summary="@string/doze_summary" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 639735d..4a5ee1d 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 2aae95e..1daf15d 100644
--- a/res/xml/app_list_disclosure_settings.xml
+++ b/res/xml/app_list_disclosure_settings.xml
@@ -21,7 +21,7 @@
     <PreferenceCategory
             android:key="dashboard_tile_placeholder"/>
 
-    <com.android.settings.widget.FooterPreference
+    <com.android.settingslib.widget.FooterPreference
             android:title="@string/enterprise_privacy_apps_count_estimation_info"
             android:selectable="false"/>
 </PreferenceScreen>
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index 1c71bfa..b96afbf 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 52ee247..4455655 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 0000000..952ec1a
--- /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 0000000..30eaf09
--- /dev/null
+++ b/res/xml/bluetooth_pairing_detail.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/bluetooth_settings">
+
+    <Preference
+        android:key="device_name"/>
+
+    <com.android.settings.bluetooth.BluetoothProgressCategory
+        android:key="available_devices"
+        android:title="@string/bluetooth_paired_device_title"/>
+
+    <com.android.settingslib.widget.FooterPreference/>
+
+</PreferenceScreen>
diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml
index 783a860..86d6d01 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 7f7b560..55a099c 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 d70cc33..ecbcbd1 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -19,7 +19,6 @@
     android:title="@string/connected_devices_dashboard_title">
 
     <com.android.settings.widget.MasterSwitchPreference
-      android:fragment="com.android.settings.bluetooth.BluetoothSettings"
       android:key="toggle_bluetooth"
       android:title="@string/bluetooth_settings_title"
       android:icon="@drawable/ic_settings_bluetooth"
diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml
index a1f3110..aca87fb 100644
--- a/res/xml/data_usage_metered_prefs.xml
+++ b/res/xml/data_usage_metered_prefs.xml
@@ -35,7 +35,7 @@
 
     </PreferenceCategory>
 
-    <com.android.settings.widget.FooterPreference
+    <com.android.settingslib.widget.FooterPreference
         android:title="@string/data_usage_metered_body"
         android:selectable="false" />
 
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index a60276c..4d5eb70 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"
@@ -411,12 +417,12 @@
             android:entries="@array/app_process_limit_entries"
             android:entryValues="@array/app_process_limit_values" />
 
-        <!-- hiding for now.
+
         <Preference
                 android:key="background_check"
                 android:fragment="com.android.settings.applications.BackgroundCheckSummary"
                 android:title="@string/background_check_pref" />
-        -->
+
 
         <SwitchPreference
             android:key="show_all_anrs"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 50e6891..27ef869 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 54854a8..4d89de6 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_settings.xml
@@ -22,11 +22,12 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_tap_power_video"
         app:animation="@raw/gesture_double_tap"
-        app:preview="@drawable/gesture_double_tap"/>
+        app:preview="@drawable/gesture_double_tap" />
 
     <SwitchPreference
         android:key="gesture_double_tap_power"
         android:title="@string/double_tap_power_for_camera_title"
-        android:summary="@string/double_tap_power_for_camera_summary"/>
+        android:summary="@string/double_tap_power_for_camera_summary"
+        app:keywords="@string/keywords_gesture" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/double_tap_screen_settings.xml b/res/xml/double_tap_screen_settings.xml
index f7fe853..1601aae 100644
--- a/res/xml/double_tap_screen_settings.xml
+++ b/res/xml/double_tap_screen_settings.xml
@@ -27,6 +27,7 @@
     <SwitchPreference
         android:key="gesture_double_tap_screen"
         android:title="@string/ambient_display_title"
-        android:summary="@string/ambient_display_summary"/>
+        android:summary="@string/ambient_display_summary"
+        app:keywords="@string/keywords_gesture"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/double_twist_gesture_settings.xml b/res/xml/double_twist_gesture_settings.xml
index f77d778..94d9782 100644
--- a/res/xml/double_twist_gesture_settings.xml
+++ b/res/xml/double_twist_gesture_settings.xml
@@ -27,6 +27,7 @@
     <SwitchPreference
         android:key="gesture_double_twist"
         android:title="@string/double_twist_for_camera_mode_title"
-        android:summary="@string/double_twist_for_camera_mode_summary"/>
+        android:summary="@string/double_twist_for_camera_mode_summary"
+        app:keywords="@string/keywords_gesture"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/dream_fragment_overview.xml b/res/xml/dream_fragment_overview.xml
new file mode 100644
index 0000000..d27a6e3
--- /dev/null
+++ b/res/xml/dream_fragment_overview.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/screensaver_settings_title" >
+
+    <com.android.settings.widget.GearPreference
+        android:key="current_screensaver"
+        android:title="@string/screensaver_settings_current"
+        android:fragment="com.android.settings.dream.CurrentDreamPicker" />
+
+    <Preference
+        android:key="when_to_start"
+        android:title="@string/screensaver_settings_when_to_dream"
+        android:fragment="com.android.settings.dream.WhenToDreamPicker" />
+
+
+    <!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->
+    <PreferenceCategory>
+        <com.android.settings.applications.LayoutPreference
+            android:key="dream_start_now_button_container"
+            android:selectable="false"
+            android:layout="@layout/dream_start_button" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index be643b1..715ea14 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 538205f..df7027c 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 6e65da6..2996c78 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 7feffca..ee25bee 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -34,6 +34,7 @@
     <com.android.settingslib.RestrictedPreference
         android:key="mobile_network_settings"
         android:title="@string/network_settings_title"
+        android:summary="@string/summary_placeholder"
         android:icon="@drawable/ic_network_cell"
         android:dependency="toggle_airplane"
         android:order="-15"
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index f78a769..dc4fecd 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -18,35 +18,25 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/night_display_title">
 
-    <PreferenceCategory
-            android:title="@string/night_display_category_schedule">
+    <DropDownPreference
+            android:key="night_display_auto_mode"
+            android:title="@string/night_display_auto_mode_title"
+            android:summary="%s" />
 
-        <DropDownPreference
-                android:key="night_display_auto_mode"
-                android:title="@string/night_display_auto_mode_title"
-                android:summary="%s" />
+    <Preference
+            android:key="night_display_start_time"
+            android:title="@string/night_display_start_time_title" />
 
-        <Preference
-                android:key="night_display_start_time"
-                android:title="@string/night_display_start_time_title" />
+    <Preference
+            android:key="night_display_end_time"
+            android:title="@string/night_display_end_time_title" />
 
-        <Preference
-                android:key="night_display_end_time"
-                android:title="@string/night_display_end_time_title" />
+    <com.android.settings.display.NightDisplayPreference
+            android:key="night_display_activated"
+            android:title="@string/night_display_status_title" />
 
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/night_display_category_status">
-
-        <com.android.settings.display.NightDisplayPreference
-                android:key="night_display_activated"
-                android:title="@string/night_display_title" />
-
-        <com.android.settings.SeekBarPreference
+    <com.android.settings.widget.SeekBarPreference
             android:key="night_display_temperature"
             android:title="@string/night_display_temperature_title"/>
 
-    </PreferenceCategory>
-
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/pick_up_gesture_settings.xml b/res/xml/pick_up_gesture_settings.xml
index 78122aa..0b4a1de 100644
--- a/res/xml/pick_up_gesture_settings.xml
+++ b/res/xml/pick_up_gesture_settings.xml
@@ -23,11 +23,12 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_pick_up_video"
         app:animation="@raw/gesture_ambient_lift"
-        app:preview="@drawable/gesture_ambient_lift"/>
+        app:preview="@drawable/gesture_ambient_lift" />
 
     <SwitchPreference
         android:key="gesture_pick_up"
         android:title="@string/ambient_display_pickup_title"
-        android:summary="@string/ambient_display_pickup_summary"/>
+        android:summary="@string/ambient_display_pickup_summary"
+        app:keywords="@string/keywords_gesture" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/drawable/search_panel_list_background.xml b/res/xml/power_abnormal_detail.xml
similarity index 68%
copy from res/drawable/search_panel_list_background.xml
copy to res/xml/power_abnormal_detail.xml
index 7f7b560..de918a9 100644
--- a/res/drawable/search_panel_list_background.xml
+++ b/res/xml/power_abnormal_detail.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,9 +14,11 @@
      limitations under the License.
 -->
 
-<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/battery_abnormal_details_title">
 
-    <color android:color="?android:attr/colorBackground" />
+    <PreferenceCategory
+        android:key="app_abnormal_list"/>
 
-</inset>
+</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 39e6c38..919f321 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 abd659e..efdae92 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 391f0fe..0d3fe76 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 7c51d25..27dbe96 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 b31d0eb..54699d3 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 be269e5..a12bdd5 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 1eeafba..e21fe5b 100644
--- a/res/xml/suggestion_ordering.xml
+++ b/res/xml/suggestion_ordering.xml
@@ -15,13 +15,21 @@
 -->
 
 <optional-steps>
+    <step category="com.android.settings.suggested.category.DEFERRED_SETUP"
+          exclusive="true" />
+    <step category="com.android.settings.suggested.category.FIRST_IMPRESSION"
+          exclusiveExpireDays="14"
+          exclusive="true"
+          multiple="true" />
     <step category="com.android.settings.suggested.category.LOCK_SCREEN" />
+    <step category="com.android.settings.suggested.category.TRUST_AGENT" />
     <step category="com.android.settings.suggested.category.EMAIL" />
     <step category="com.android.settings.suggested.category.PARTNER_ACCOUNT"
-        multiple="true" />
+          multiple="true" />
+    <step category="com.android.settings.suggested.category.GESTURE" />
     <step category="com.android.settings.suggested.category.HOTWORD" />
     <step category="com.android.settings.suggested.category.DEFAULT"
-        multiple="true" />
+          multiple="true" />
     <step category="com.android.settings.suggested.category.SETTINGS_ONLY"
-        multiple="true" />
+          multiple="true" />
 </optional-steps>
diff --git a/res/xml/swipe_to_notification_settings.xml b/res/xml/swipe_to_notification_settings.xml
index b26af38..6269bdc 100644
--- a/res/xml/swipe_to_notification_settings.xml
+++ b/res/xml/swipe_to_notification_settings.xml
@@ -27,6 +27,7 @@
     <SwitchPreference
         android:key="gesture_swipe_down_fingerprint"
         android:title="@string/fingerprint_swipe_for_notifications_title"
-        android:summary="@string/fingerprint_swipe_for_notifications_summary"/>
+        android:summary="@string/fingerprint_swipe_for_notifications_summary"
+        app:keywords="@string/keywords_gesture"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index a936a50..a506291 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -19,7 +19,8 @@
 
     <SwitchPreference
         android:key="usb_tether_settings"
-        android:title="@string/usb_tethering_button_text" />
+        android:title="@string/usb_tethering_button_text"
+        android:summary="@string/usb_tethering_subtext"/>
 
     <SwitchPreference
         android:key="enable_wifi_ap"
@@ -33,7 +34,8 @@
 
     <SwitchPreference
         android:key="enable_bluetooth_tethering"
-        android:title="@string/bluetooth_tether_checkbox_text" />
+        android:title="@string/bluetooth_tether_checkbox_text"
+        android:summary="@string/bluetooth_tethering_subtext"/>
 
     <Preference
         android:key="disabled_on_data_saver"
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index 78c4c44..c141dad 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -37,14 +37,14 @@
 
         <!-- The max value for seek bars here should be kept in sync
              with the max value specified in TextToSpeechSettings class. -->
-        <com.android.settings.SeekBarPreference
+        <com.android.settings.widget.SeekBarPreference
             android:key="tts_default_rate"
             android:title="@string/tts_default_rate_title"
             android:summary="@string/tts_default_rate_summary"
             android:defaultValue="50"
             android:max="600"/>
 
-        <com.android.settings.SeekBarPreference
+        <com.android.settings.widget.SeekBarPreference
             android:key="tts_default_pitch"
             android:title="@string/tts_default_pitch_title"
             android:summary="@string/tts_default_pitch_summary"
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index ac992d7..1747b63 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/wifi_configure_titlebar">
+        android:title="@string/wifi_configure_settings_preference_title">
 
     <SwitchPreference
             android:key="enable_wifi_wakeup"
@@ -42,12 +42,6 @@
         android:title="@string/wifi_cellular_data_fallback_title"
         android:summary="@string/wifi_cellular_data_fallback_summary"/>
 
-    <ListPreference
-            android:key="sleep_policy"
-            android:title="@string/wifi_setting_sleep_policy_title"
-            android:entries="@array/wifi_sleep_policy_entries"
-            android:entryValues="@array/wifi_sleep_policy_values" />
-
     <Preference
             android:key="install_credentials"
             android:title="@string/wifi_install_credentials">
@@ -71,10 +65,8 @@
 
     <Preference
             android:key="wifi_direct"
-            android:title="@string/wifi_menu_p2p">
-        <intent android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.Settings$WifiP2pSettingsActivity"/>
-    </Preference>
+            android:title="@string/wifi_menu_p2p"
+            android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"/>
 
     <Preference
             android:key="wps_push_button"
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index f9926ca..64e61b1 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 2b19ee9..0bdc1cf 100644
--- a/res/xml/wifi_p2p_settings.xml
+++ b/res/xml/wifi_p2p_settings.xml
@@ -15,5 +15,13 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <Preference
+        android:key="p2p_this_device"
+        android:selectable="false" />
+    <PreferenceCategory
+        android:key="p2p_peer_devices"
+        android:title="@string/wifi_p2p_peer_devices" />
+    <PreferenceCategory
+        android:key="p2p_persistent_group"
+        android:title="@string/wifi_p2p_remembered_groups" />
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml
index e2b8f48..e4f8f5e 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 7393091..e61f959 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -146,7 +146,8 @@
             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 @@
     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 @@
         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 37552ed..d554301 100755
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -193,7 +193,7 @@
         mUnavailable = isUiRestricted();
         setHasOptionsMenu(!mUnavailable);
         if (mUnavailable) {
-            addPreferencesFromResource(R.xml.empty_settings);
+            addPreferencesFromResource(R.xml.placeholder_prefs);
             return;
         }
 
diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index 7572d97..6371e3a 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -29,6 +29,7 @@
 
 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 d662c2e..e5d40b7 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -47,14 +47,16 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.org.bouncycastle.asn1.ASN1InputStream;
 import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.security.ConfigureKeyGuardDialog;
 import com.android.settings.vpn2.VpnUtils;
 
-import sun.security.util.ObjectIdentifier;
-import sun.security.x509.AlgorithmId;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
+import sun.security.util.ObjectIdentifier;
+import sun.security.x509.AlgorithmId;
+
 /**
  * CredentialStorage handles KeyStore reset, unlock, and install.
  *
@@ -72,14 +74,14 @@
  * KeyGuard: ON
  * Action:   confirm key guard
  * Notes:    user had key guard but no keystore and upgraded from pre-ICS
- *           OR user had key guard and pre-ICS keystore password which was then reset
+ * OR user had key guard and pre-ICS keystore password which was then reset
  *
  * KeyStore: LOCKED
  * KeyGuard: OFF/ON
  * Action:   old unlock dialog
  * Notes:    assume old password, need to use it to unlock.
- *           if unlock, ensure key guard before install.
- *           if reset, treat as UNINITALIZED/OFF
+ * if unlock, ensure key guard before install.
+ * if reset, treat as UNINITALIZED/OFF
  *
  * KeyStore: UNLOCKED
  * KeyGuard: OFF
@@ -101,7 +103,7 @@
 
     // This is the minimum acceptable password quality.  If the current password quality is
     // lower than this, keystore should not be activated.
-    static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
+    public static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
 
     private static final int CONFIRM_KEY_GUARD_REQUEST = 1;
     private static final int CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST = 2;
@@ -169,7 +171,8 @@
             }
             case UNLOCKED: {
                 if (!checkKeyGuardQuality()) {
-                    new ConfigureKeyGuardDialog();
+                    final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
+                    dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);
                     return;
                 }
                 installIfAvailable();
@@ -188,7 +191,8 @@
     private void ensureKeyGuard() {
         if (!checkKeyGuardQuality()) {
             // key guard not setup, doing so will initialize keystore
-            new ConfigureKeyGuardDialog();
+            final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
+            dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);
             // will return to onResume after Activity
             return;
         }
@@ -306,8 +310,7 @@
      * Prompt for reset confirmation, resetting on confirmation, finishing otherwise.
      */
     private class ResetDialog
-            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener
-    {
+            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
         private boolean mResetConfirmed;
 
         private ResetDialog() {
@@ -321,11 +324,13 @@
             dialog.show();
         }
 
-        @Override public void onClick(DialogInterface dialog, int button) {
+        @Override
+        public void onClick(DialogInterface dialog, int button) {
             mResetConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
         }
 
-        @Override public void onDismiss(DialogInterface dialog) {
+        @Override
+        public void onDismiss(DialogInterface dialog) {
             if (mResetConfirmed) {
                 mResetConfirmed = false;
                 if (confirmKeyGuard(CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST)) {
@@ -342,7 +347,8 @@
      */
     private class ResetKeyStoreAndKeyChain extends AsyncTask<Void, Void, Boolean> {
 
-        @Override protected Boolean doInBackground(Void... unused) {
+        @Override
+        protected Boolean doInBackground(Void... unused) {
 
             // Clear all the users credentials could have been installed in for this user.
             new LockPatternUtils(CredentialStorage.this).resetKeyStore(UserHandle.myUserId());
@@ -362,14 +368,15 @@
             }
         }
 
-        @Override protected void onPostExecute(Boolean success) {
+        @Override
+        protected void onPostExecute(Boolean success) {
             if (success) {
                 Toast.makeText(CredentialStorage.this,
-                               R.string.credentials_erased, Toast.LENGTH_SHORT).show();
+                        R.string.credentials_erased, Toast.LENGTH_SHORT).show();
                 clearLegacyVpnIfEstablished();
             } else {
                 Toast.makeText(CredentialStorage.this,
-                               R.string.credentials_not_erased, Toast.LENGTH_SHORT).show();
+                        R.string.credentials_not_erased, Toast.LENGTH_SHORT).show();
             }
             finish();
         }
@@ -384,42 +391,6 @@
     }
 
     /**
-     * Prompt for key guard configuration confirmation.
-     */
-    private class ConfigureKeyGuardDialog
-            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener
-    {
-        private boolean mConfigureConfirmed;
-
-        private ConfigureKeyGuardDialog() {
-            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
-                    .setTitle(android.R.string.dialog_alert_title)
-                    .setMessage(R.string.credentials_configure_lock_screen_hint)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, this)
-                    .create();
-            dialog.setOnDismissListener(this);
-            dialog.show();
-        }
-
-        @Override public void onClick(DialogInterface dialog, int button) {
-            mConfigureConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
-        }
-
-        @Override public void onDismiss(DialogInterface dialog) {
-            if (mConfigureConfirmed) {
-                mConfigureConfirmed = false;
-                Intent intent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
-                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
-                                MIN_PASSWORD_QUALITY);
-                startActivity(intent);
-                return;
-            }
-            finish();
-        }
-    }
-
-    /**
      * Check that the caller is either certinstaller or Settings running in a profile of this user.
      */
     private boolean checkCallerIsCertInstallerOrSelfInProfile() {
@@ -504,8 +475,7 @@
      * On unsuccessful unlock, retry by calling handleUnlockOrInstall.
      */
     private class UnlockDialog implements TextWatcher,
-            DialogInterface.OnClickListener, DialogInterface.OnDismissListener
-    {
+            DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
         private boolean mUnlockConfirmed;
 
         private final Button mButton;
@@ -544,21 +514,26 @@
             mButton.setEnabled(false);
         }
 
-        @Override public void afterTextChanged(Editable editable) {
+        @Override
+        public void afterTextChanged(Editable editable) {
             mButton.setEnabled(mOldPassword == null || mOldPassword.getText().length() > 0);
         }
 
-        @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
         }
 
-        @Override public void onTextChanged(CharSequence s,int start, int before, int count) {
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
         }
 
-        @Override public void onClick(DialogInterface dialog, int button) {
+        @Override
+        public void onClick(DialogInterface dialog, int button) {
             mUnlockConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
         }
 
-        @Override public void onDismiss(DialogInterface dialog) {
+        @Override
+        public void onDismiss(DialogInterface dialog) {
             if (mUnlockConfirmed) {
                 mUnlockConfirmed = false;
                 mError.setVisibility(View.VISIBLE);
@@ -567,16 +542,16 @@
                 if (error == KeyStore.NO_ERROR) {
                     mRetriesRemaining = -1;
                     Toast.makeText(CredentialStorage.this,
-                                   R.string.credentials_enabled,
-                                   Toast.LENGTH_SHORT).show();
+                            R.string.credentials_enabled,
+                            Toast.LENGTH_SHORT).show();
                     // aha, now we are unlocked, switch to key guard.
                     // we'll end up back in onResume to install
                     ensureKeyGuard();
                 } else if (error == KeyStore.UNINITIALIZED) {
                     mRetriesRemaining = -1;
                     Toast.makeText(CredentialStorage.this,
-                                   R.string.credentials_erased,
-                                   Toast.LENGTH_SHORT).show();
+                            R.string.credentials_erased,
+                            Toast.LENGTH_SHORT).show();
                     // we are reset, we can now set new password with key guard
                     handleUnlockOrInstall();
                 } else if (error >= KeyStore.WRONG_PASSWORD) {
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 99c6e8b..1f331d7 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -888,7 +888,7 @@
             mPasswordEntry.setEnabled(false);
             setBackFunctionality(false);
 
-            if (password.length() >= LockPatternUtils.MIN_LOCK_PATTERN_SIZE) {
+            if (password.length() >= LockPatternUtils.MIN_LOCK_PASSWORD_SIZE) {
                 new DecryptTask().execute(password);
             } else {
                 // Allow user to make as many of these as they want.
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index d9b98f0..e11bccd 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -37,6 +37,8 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmLockPattern;
 
 public class CryptKeeperSettings extends InstrumentedPreferenceFragment {
     private static final String TAG = "CryptKeeper";
diff --git a/src/com/android/settings/CustomDialogPreference.java b/src/com/android/settings/CustomDialogPreference.java
deleted file mode 100644
index 383163f..0000000
--- 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 66c6932..0000000
--- 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 8dfb02b..0805e4b 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -24,7 +24,6 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
@@ -42,6 +41,7 @@
 import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 1ef3b53..15818e2 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -17,18 +17,18 @@
 package com.android.settings;
 
 import android.content.Context;
-import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.display.AmbientDisplayPreferenceController;
 import com.android.settings.display.AutoBrightnessPreferenceController;
 import com.android.settings.display.AutoRotatePreferenceController;
+import com.android.settings.display.BrightnessLevelPreferenceController;
 import com.android.settings.display.CameraGesturePreferenceController;
-import com.android.settings.display.DozePreferenceController;
+import com.android.settings.display.ColorModePreferenceController;
 import com.android.settings.display.FontSizePreferenceController;
 import com.android.settings.display.LiftToWakePreferenceController;
 import com.android.settings.display.NightDisplayPreferenceController;
@@ -39,10 +39,9 @@
 import com.android.settings.display.TimeoutPreferenceController;
 import com.android.settings.display.VrDisplayPreferenceController;
 import com.android.settings.display.WallpaperPreferenceController;
-import com.android.settings.gestures.DoubleTapScreenPreferenceController;
-import com.android.settings.gestures.PickupGesturePreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,12 +49,11 @@
 public class DisplaySettings extends DashboardFragment {
     private static final String TAG = "DisplaySettings";
 
+    public static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
     public static final String KEY_DISPLAY_SIZE = "screen_zoom";
 
-    private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
-    private static final String KEY_PICK_UP = "gesture_pick_up_display_summary";
-    private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_display_summary";
+    private static final String KEY_AMBIENT_DISPLAY = "ambient_display";
 
     @Override
     public int getMetricsCategory() {
@@ -92,25 +90,24 @@
             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 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 bb9e978..0000000
--- a/src/com/android/settings/DreamSettings.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnTouchListener;
-import android.widget.ImageView;
-import android.widget.RadioButton;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.DreamInfo;
-
-import java.util.List;
-
-public class DreamSettings extends SettingsPreferenceFragment implements
-        SwitchBar.OnSwitchChangeListener {
-    private static final String TAG = DreamSettings.class.getSimpleName();
-    static final boolean DEBUG = false;
-    private static final int DIALOG_WHEN_TO_DREAM = 1;
-    private static final String PACKAGE_SCHEME = "package";
-
-    private final PackageReceiver mPackageReceiver = new PackageReceiver();
-
-    private Context mContext;
-    private DreamBackend mBackend;
-    private SwitchBar mSwitchBar;
-    private MenuItem[] mMenuItemsWhenEnabled;
-    private boolean mRefreshing;
-
-    @Override
-    public int getHelpResource() {
-        return R.string.help_url_dreams;
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        logd("onAttach(%s)", activity.getClass().getSimpleName());
-        super.onAttach(activity);
-        mContext = activity;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.DREAM;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        logd("onCreate(%s)", icicle);
-        super.onCreate(icicle);
-
-        mBackend = new DreamBackend(getActivity());
-
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onSwitchChanged(Switch switchView, boolean isChecked) {
-        if (!mRefreshing) {
-            mBackend.setEnabled(isChecked);
-            refreshFromBackend();
-        }
-    }
-
-    @Override
-    public void onStart() {
-        logd("onStart()");
-        super.onStart();
-    }
-
-    @Override
-    public void onDestroyView() {
-        logd("onDestroyView()");
-        super.onDestroyView();
-
-        mSwitchBar.removeOnSwitchChangeListener(this);
-        mSwitchBar.hide();
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        logd("onActivityCreated(%s)", savedInstanceState);
-        super.onActivityCreated(savedInstanceState);
-
-        TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
-        emptyView.setText(R.string.screensaver_settings_disabled_prompt);
-        setEmptyView(emptyView);
-
-        final SettingsActivity sa = (SettingsActivity) getActivity();
-        mSwitchBar = sa.getSwitchBar();
-        mSwitchBar.addOnSwitchChangeListener(this);
-        mSwitchBar.show();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        logd("onCreateOptionsMenu()");
-
-        boolean isEnabled = mBackend.isEnabled();
-
-        // create "start" action
-        MenuItem start = createMenuItem(menu, R.string.screensaver_settings_dream_start,
-                MenuItem.SHOW_AS_ACTION_NEVER,
-                isEnabled, new Runnable(){
-                    @Override
-                    public void run() {
-                        mBackend.startDreaming();
-                    }});
-
-        // create "when to dream" overflow menu item
-        MenuItem whenToDream = createMenuItem(menu,
-                R.string.screensaver_settings_when_to_dream,
-                MenuItem.SHOW_AS_ACTION_NEVER,
-                isEnabled,
-                new Runnable() {
-                    @Override
-                    public void run() {
-                        showDialog(DIALOG_WHEN_TO_DREAM);
-                    }});
-
-        // create "help" overflow menu item (make sure it appears last)
-        super.onCreateOptionsMenu(menu, inflater);
-
-        mMenuItemsWhenEnabled = new MenuItem[] { start, whenToDream };
-    }
-
-    private MenuItem createMenuItem(Menu menu,
-            int titleRes, int actionEnum, boolean isEnabled, final Runnable onClick) {
-        MenuItem item = menu.add(titleRes);
-        item.setShowAsAction(actionEnum);
-        item.setEnabled(isEnabled);
-        item.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                onClick.run();
-                return true;
-            }
-        });
-        return item;
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        logd("onCreateDialog(%s)", dialogId);
-        if (dialogId == DIALOG_WHEN_TO_DREAM)
-            return createWhenToDreamDialog();
-        return super.onCreateDialog(dialogId);
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (dialogId == DIALOG_WHEN_TO_DREAM) {
-            return MetricsEvent.DIALOG_DREAM_START_DELAY;
-        }
-        return 0;
-    }
-
-    private Dialog createWhenToDreamDialog() {
-        final CharSequence[] items = {
-                mContext.getString(R.string.screensaver_settings_summary_dock),
-                mContext.getString(R.string.screensaver_settings_summary_sleep),
-                mContext.getString(R.string.screensaver_settings_summary_either_short)
-        };
-
-        int initialSelection = mBackend.isActivatedOnDock() && mBackend.isActivatedOnSleep() ? 2
-                : mBackend.isActivatedOnDock() ? 0
-                : mBackend.isActivatedOnSleep() ? 1
-                : -1;
-
-        return new AlertDialog.Builder(mContext)
-                .setTitle(R.string.screensaver_settings_when_to_dream)
-                .setSingleChoiceItems(items, initialSelection, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int item) {
-                        mBackend.setActivatedOnDock(item == 0 || item == 2);
-                        mBackend.setActivatedOnSleep(item == 1 || item == 2);
-                        dialog.dismiss();
-                    }
-                })
-                .create();
-    }
-
-    @Override
-    public void onPause() {
-        logd("onPause()");
-        super.onPause();
-
-        mContext.unregisterReceiver(mPackageReceiver);
-    }
-
-    @Override
-    public void onResume() {
-        logd("onResume()");
-        super.onResume();
-        refreshFromBackend();
-
-        // listen for package changes
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
-        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
-        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-        filter.addDataScheme(PACKAGE_SCHEME);
-        mContext.registerReceiver(mPackageReceiver , filter);
-    }
-
-    public static int getSummaryResource(Context context) {
-        DreamBackend backend = new DreamBackend(context);
-        boolean isEnabled = backend.isEnabled();
-        boolean activatedOnSleep = backend.isActivatedOnSleep();
-        boolean activatedOnDock = backend.isActivatedOnDock();
-        boolean activatedOnEither = activatedOnSleep && activatedOnDock;
-        return !isEnabled ? R.string.screensaver_settings_summary_off
-                : activatedOnEither ? R.string.screensaver_settings_summary_either_long
-                : activatedOnSleep ? R.string.screensaver_settings_summary_sleep
-                : activatedOnDock ? R.string.screensaver_settings_summary_dock
-                : 0;
-    }
-
-    public static CharSequence getSummaryTextWithDreamName(Context context) {
-        DreamBackend backend = new DreamBackend(context);
-        boolean isEnabled = backend.isEnabled();
-        if (!isEnabled) {
-            return context.getString(R.string.screensaver_settings_summary_off);
-        } else {
-            return backend.getActiveDreamName();
-        }
-    }
-
-    private void refreshFromBackend() {
-        logd("refreshFromBackend()");
-        mRefreshing = true;
-        boolean dreamsEnabled = mBackend.isEnabled();
-        if (mSwitchBar.isChecked() != dreamsEnabled) {
-            mSwitchBar.setChecked(dreamsEnabled);
-        }
-
-        if (getPreferenceScreen() == null) {
-            setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
-        }
-        getPreferenceScreen().removeAll();
-        if (dreamsEnabled) {
-            List<DreamBackend.DreamInfo> dreamInfos = mBackend.getDreamInfos();
-            final int N = dreamInfos.size();
-            for (int i = 0; i < N; i++) {
-                getPreferenceScreen().addPreference(
-                        new DreamInfoPreference(getPrefContext(), dreamInfos.get(i)));
-            }
-        }
-        if (mMenuItemsWhenEnabled != null) {
-            for (MenuItem menuItem : mMenuItemsWhenEnabled) {
-                menuItem.setEnabled(dreamsEnabled);
-            }
-        }
-        mRefreshing = false;
-    }
-
-    private static void logd(String msg, Object... args) {
-        if (DEBUG) Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
-    }
-
-    private class DreamInfoPreference extends Preference {
-
-        private final DreamInfo mInfo;
-
-        public DreamInfoPreference(Context context, DreamInfo info) {
-            super(context);
-            mInfo = info;
-            setLayoutResource(R.layout.dream_info_row);
-            setTitle(mInfo.caption);
-            setIcon(mInfo.icon);
-        }
-
-        public void onBindViewHolder(final PreferenceViewHolder holder) {
-            super.onBindViewHolder(holder);
-
-            // bind radio button
-            RadioButton radioButton = (RadioButton) holder.findViewById(android.R.id.button1);
-            radioButton.setChecked(mInfo.isActive);
-            radioButton.setOnTouchListener(new OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    holder.itemView.onTouchEvent(event);
-                    return false;
-                }
-            });
-
-            // bind settings button + divider
-            boolean showSettings = mInfo.settingsComponentName != null;
-            View settingsDivider = holder.findViewById(R.id.divider);
-            settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
-
-            ImageView settingsButton = (ImageView) holder.findViewById(android.R.id.button2);
-            settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
-            settingsButton.setAlpha(mInfo.isActive ? 1f : Utils.DISABLED_ALPHA);
-            settingsButton.setEnabled(mInfo.isActive);
-            settingsButton.setFocusable(mInfo.isActive);
-            settingsButton.setOnClickListener(new OnClickListener(){
-                @Override
-                public void onClick(View v) {
-                    mBackend.launchSettings(mInfo);
-                }
-            });
-        }
-
-        @Override
-        public void performClick() {
-            if (mInfo.isActive)
-                return;
-            for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
-                DreamInfoPreference preference =
-                        (DreamInfoPreference) getPreferenceScreen().getPreference(i);
-                preference.mInfo.isActive = false;
-                preference.notifyChanged();
-            }
-            mInfo.isActive = true;
-            mBackend.setActiveDream(mInfo.componentName);
-            notifyChanged();
-        }
-    }
-
-    private class PackageReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            logd("PackageReceiver.onReceive");
-            refreshFromBackend();
-        }
-    }
-}
diff --git a/src/com/android/settings/EditPinPreference.java b/src/com/android/settings/EditPinPreference.java
index fdad0a1..2da4541 100644
--- a/src/com/android/settings/EditPinPreference.java
+++ b/src/com/android/settings/EditPinPreference.java
@@ -23,6 +23,8 @@
 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 @@
     interface OnPinEnteredListener {
         void onPinEntered(EditPinPreference preference, boolean positiveResult);
     }
-    
+
     private OnPinEnteredListener mPinListener;
-    
+
     public EditPinPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
@@ -41,7 +43,7 @@
     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 1750e75..4892f7e 100644
--- a/src/com/android/settings/EncryptionAndCredential.java
+++ b/src/com/android/settings/EncryptionAndCredential.java
@@ -20,7 +20,6 @@
 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.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 @@
             }
         }
 
-
         // Credential storage
         mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
 
@@ -168,7 +165,7 @@
 
     @Override
     protected int getHelpResource() {
-        return R.string.help_url_security;
+        return R.string.help_url_encryption;
     }
 
     /**
@@ -182,28 +179,22 @@
         @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;
@@ -211,54 +202,34 @@
         }
 
         @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 42ca516..f0115b8 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;
@@ -54,6 +58,12 @@
     }
 
     @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 @@
         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 @@
                 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 @@
             }
         }
 
-        @Override
-        public Dialog onCreateDialog(int dialogId) {
-            switch(dialogId) {
-                case ACCESSIBILITY_WARNING_DIALOG: {
-                    final int titleId;
-                    final int messageId;
-                    switch (mRequestedPasswordQuality) {
-                        case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                            titleId = R.string.encrypt_talkback_dialog_require_pattern;
-                            messageId = R.string.encrypt_talkback_dialog_message_pattern;
-                            break;
-                        case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-                        case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
-                            titleId = R.string.encrypt_talkback_dialog_require_pin;
-                            messageId = R.string.encrypt_talkback_dialog_message_pin;
-                            break;
-                        default:
-                            titleId = R.string.encrypt_talkback_dialog_require_password;
-                            messageId = R.string.encrypt_talkback_dialog_message_password;
-                            break;
-                    }
-
-
-                    List<AccessibilityServiceInfo> list =
-                            AccessibilityManager.getInstance(getActivity())
-                            .getEnabledAccessibilityServiceList(
-                                    AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
-                    final CharSequence exampleAccessibility;
-                    if (list.isEmpty()) {
-                        // This should never happen.  But we shouldn't crash
-                        exampleAccessibility = "";
-                    } else {
-                        exampleAccessibility = list.get(0).getResolveInfo()
-                                .loadLabel(getPackageManager());
-                    }
-                    return new AlertDialog.Builder(getActivity())
-                        .setTitle(titleId)
-                        .setMessage(getString(messageId, exampleAccessibility))
-                        .setCancelable(true)
-                        .setPositiveButton(android.R.string.ok, this)
-                        .setNegativeButton(android.R.string.cancel, this)
-                        .create();
-                }
-                default: throw new IllegalArgumentException();
-            }
-        }
-
-        @Override
-        public int getDialogMetricsCategory(int dialogId) {
-            if (dialogId == ACCESSIBILITY_WARNING_DIALOG) {
-                return MetricsEvent.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY;
-            }
-            return 0;
-        }
-
         private void setRequirePasswordState(boolean required) {
             mPasswordRequired = required;
         }
 
+        public void finish() {
+            Activity activity = getActivity();
+            if (activity == null) return;
+            if (getFragmentManager().getBackStackEntryCount() > 0) {
+                getFragmentManager().popBackStack();
+            } else {
+                activity.finish();
+            }
+        }
+    }
+
+    public static class AccessibilityWarningDialogFragment extends InstrumentedDialogFragment
+            implements DialogInterface.OnClickListener {
+
+        public static final String TAG = "AccessibilityWarningDialog";
+
+        public static AccessibilityWarningDialogFragment newInstance(int passwordQuality) {
+            AccessibilityWarningDialogFragment fragment = new AccessibilityWarningDialogFragment();
+            Bundle args = new Bundle(1);
+            args.putInt(EXTRA_PASSWORD_QUALITY, passwordQuality);
+            fragment.setArguments(args);
+            return fragment;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final int titleId;
+            final int messageId;
+            switch (getArguments().getInt(EXTRA_PASSWORD_QUALITY)) {
+                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                    titleId = R.string.encrypt_talkback_dialog_require_pattern;
+                    messageId = R.string.encrypt_talkback_dialog_message_pattern;
+                    break;
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                    titleId = R.string.encrypt_talkback_dialog_require_pin;
+                    messageId = R.string.encrypt_talkback_dialog_message_pin;
+                    break;
+                default:
+                    titleId = R.string.encrypt_talkback_dialog_require_password;
+                    messageId = R.string.encrypt_talkback_dialog_message_password;
+                    break;
+            }
+
+
+            final Activity activity = getActivity();
+            List<AccessibilityServiceInfo> list =
+                    AccessibilityManager.getInstance(activity)
+                            .getEnabledAccessibilityServiceList(
+                                    AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
+            final CharSequence exampleAccessibility;
+            if (list.isEmpty()) {
+                // This should never happen.  But we shouldn't crash
+                exampleAccessibility = "";
+            } else {
+                exampleAccessibility = list.get(0).getResolveInfo()
+                        .loadLabel(activity.getPackageManager());
+            }
+            return new AlertDialog.Builder(activity)
+                    .setTitle(titleId)
+                    .setMessage(getString(messageId, exampleAccessibility))
+                    .setCancelable(true)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY;
+        }
+
         @Override
         public void onClick(DialogInterface dialog, int which) {
-            if (which == DialogInterface.BUTTON_POSITIVE) {
-                setRequirePasswordState(true);
-                startLockIntent();
-            } else if (which == DialogInterface.BUTTON_NEGATIVE) {
-                setRequirePasswordState(false);
+            EncryptionInterstitialFragment fragment =
+                    (EncryptionInterstitialFragment) getParentFragment();
+            if (fragment != null) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    fragment.setRequirePasswordState(true);
+                    fragment.startLockIntent();
+                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
+                    fragment.setRequirePasswordState(false);
+                }
             }
         }
     }
diff --git a/src/com/android/settings/HelpTrampoline.java b/src/com/android/settings/HelpTrampoline.java
index 7eb28a0..0de15e3 100644
--- a/src/com/android/settings/HelpTrampoline.java
+++ b/src/com/android/settings/HelpTrampoline.java
@@ -39,7 +39,11 @@
 
             final Intent intent = HelpUtils.getHelpIntent(this, value, null);
             if (intent != null) {
-                startActivity(intent);
+                /*
+                 * TODO: b/38230998.
+                 * Move to startActivity once the HelpUtils.getHelpIntent is refactored
+                 */
+                startActivityForResult(intent, 0);
             }
 
         } catch (Resources.NotFoundException | ActivityNotFoundException e) {
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index d7de8fb..3e139e1 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -288,6 +288,11 @@
     }
 
     @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
         // There is one case where the dialog is popped up by the preference
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 69f563e..2c97018 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.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.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 @@
  *
  * 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 @@
         }
     }
 
-    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 @@
      * 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() {
+    @VisibleForTesting
+    protected 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 */);
+        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 @@
         }
     };
 
-    @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 @@
             });
         }
 
+        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 @@
         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 @@
         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 218ebbb..39bf01a 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -24,7 +24,7 @@
 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 @@
 
     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 @@
 
             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 @@
         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 @@
         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 ddf0dec..db1f01d 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -20,6 +20,8 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.QueuedWork;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -31,6 +33,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.telephony.CarrierConfigManager;
 import android.telephony.CellInfo;
 import android.telephony.CellInfoCdma;
 import android.telephony.CellInfoGsm;
@@ -129,6 +132,9 @@
     private static final int IMS_WFC_PROVISIONED_CONFIG_ID =
         ImsConfig.ConfigConstants.VOICE_OVER_WIFI_SETTING_ENABLED;
 
+    private static final int EAB_PROVISIONED_CONFIG_ID =
+        ImsConfig.ConfigConstants.EAB_SETTING_ENABLED;
+
     //Values in must match mCellInfoRefreshRates
     private static final String[] mCellInfoRefreshRateLabels = {
             "Disabled",
@@ -195,9 +201,12 @@
     private Button updateSmscButton;
     private Button refreshSmscButton;
     private Button oemInfoButton;
+    private Button carrierProvisioningButton;
+    private Button triggercarrierProvisioningButton;
     private Switch imsVolteProvisionedSwitch;
     private Switch imsVtProvisionedSwitch;
     private Switch imsWfcProvisionedSwitch;
+    private Switch eabProvisionedSwitch;
     private Spinner preferredNetworkType;
     private Spinner cellInfoRefreshRateSpinner;
 
@@ -403,6 +412,7 @@
         imsVolteProvisionedSwitch = (Switch) findViewById(R.id.volte_provisioned_switch);
         imsVtProvisionedSwitch = (Switch) findViewById(R.id.vt_provisioned_switch);
         imsWfcProvisionedSwitch = (Switch) findViewById(R.id.wfc_provisioned_switch);
+        eabProvisionedSwitch = (Switch) findViewById(R.id.eab_provisioned_switch);
 
         radioPowerOnSwitch = (Switch) findViewById(R.id.radio_power);
 
@@ -414,6 +424,11 @@
         refreshSmscButton.setOnClickListener(mRefreshSmscButtonHandler);
         dnsCheckToggleButton = (Button) findViewById(R.id.dns_check_toggle);
         dnsCheckToggleButton.setOnClickListener(mDnsCheckButtonHandler);
+        carrierProvisioningButton = (Button) findViewById(R.id.carrier_provisioning);
+        carrierProvisioningButton.setOnClickListener(mCarrierProvisioningButtonHandler);
+        triggercarrierProvisioningButton = (Button) findViewById(R.id.trigger_carrier_provisioning);
+        triggercarrierProvisioningButton.setOnClickListener(
+                mTriggerCarrierProvisioningButtonHandler);
 
         oemInfoButton = (Button) findViewById(R.id.oem_info);
         oemInfoButton.setOnClickListener(mOemInfoButtonHandler);
@@ -470,6 +485,7 @@
         imsVolteProvisionedSwitch.setOnCheckedChangeListener(mImsVolteCheckedChangeListener);
         imsVtProvisionedSwitch.setOnCheckedChangeListener(mImsVtCheckedChangeListener);
         imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
+        eabProvisionedSwitch.setOnCheckedChangeListener(mEabCheckedChangeListener);
 
         mTelephonyManager.listen(mPhoneStateListener,
                   PhoneStateListener.LISTEN_CALL_STATE
@@ -1162,6 +1178,11 @@
         setImsConfigProvisionedState(IMS_WFC_PROVISIONED_CONFIG_ID, state);
     }
 
+    void setEabProvisionedState(boolean state) {
+        Log.d(TAG, "setEabProvisioned() state: " + ((state)? "on":"off"));
+        setImsConfigProvisionedState(EAB_PROVISIONED_CONFIG_ID, state);
+    }
+
     void setImsConfigProvisionedState(int configItem, boolean state) {
         if (phone != null && mImsManager != null) {
             QueuedWork.queue(new Runnable() {
@@ -1231,6 +1252,48 @@
         }
     };
 
+    private boolean isEabProvisioned() {
+        return isFeatureProvisioned(EAB_PROVISIONED_CONFIG_ID, false);
+    }
+
+    OnCheckedChangeListener mEabCheckedChangeListener = new OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            setEabProvisionedState(isChecked);
+        }
+    };
+
+    private boolean isFeatureProvisioned(int featureId, boolean defaultValue) {
+        boolean provisioned = defaultValue;
+        if (mImsManager != null) {
+            try {
+                ImsConfig imsConfig = mImsManager.getConfigInterface();
+                if (imsConfig != null) {
+                    provisioned =
+                            (imsConfig.getProvisionedValue(featureId)
+                                    == ImsConfig.FeatureValueConstants.ON);
+                }
+            } catch (ImsException ex) {
+                Log.e(TAG, "isFeatureProvisioned() exception:", ex);
+            }
+        }
+
+        log("isFeatureProvisioned() featureId=" + featureId + " provisioned=" + provisioned);
+        return provisioned;
+    }
+
+    private static boolean isEabEnabledByPlatform(Context context) {
+        if (context != null) {
+            CarrierConfigManager configManager = (CarrierConfigManager)
+                    context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
+            if (configManager != null && configManager.getConfig().getBoolean(
+                        CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private void updateImsProvisionedState() {
         log("updateImsProvisionedState isImsVolteProvisioned()=" + isImsVolteProvisioned());
         //delightful hack to prevent on-checked-changed calls from
@@ -1252,6 +1315,11 @@
         imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
         imsWfcProvisionedSwitch.setEnabled(
             mImsManager.isWfcEnabledByPlatform(phone.getContext()));
+
+        eabProvisionedSwitch.setOnCheckedChangeListener(null);
+        eabProvisionedSwitch.setChecked(isEabProvisioned());
+        eabProvisionedSwitch.setOnCheckedChangeListener(mEabCheckedChangeListener);
+        eabProvisionedSwitch.setEnabled(isEabEnabledByPlatform(phone.getContext()));
     }
 
     OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
@@ -1295,6 +1363,26 @@
         }
     };
 
+    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 fd94b67..043071c 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -20,15 +20,20 @@
 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 @@
  */
 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 @@
                 .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 @@
 
         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 @@
                 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 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 45490ab..1529e77 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -34,13 +34,14 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmLockPattern;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * Confirm and execute a reset of the device's network settings to a clean "just out of the box"
  * state.  Multiple confirmations are required: first, a general "are you sure you want to do this?"
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index d220e73..f70d3c2 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -18,9 +18,11 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothManager;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkPolicyManager;
+import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -104,6 +106,7 @@
             }
 
             ImsManager.factoryReset(context);
+            restoreDefaultApn(context);
 
             Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                     .show();
@@ -111,6 +114,20 @@
     };
 
     /**
+     * Restore APN settings to default.
+     */
+    private void restoreDefaultApn(Context context) {
+        Uri uri = Uri.parse(ApnSettings.RESTORE_CARRIERS_URI);
+
+        if (SubscriptionManager.isUsableSubIdValue(mSubId)) {
+            uri = Uri.withAppendedPath(uri, "subId/" + String.valueOf(mSubId));
+        }
+
+        ContentResolver resolver = context.getContentResolver();
+        resolver.delete(uri, null, null);
+    }
+
+    /**
      * Configure the UI for the final confirmation interaction
      */
     private void establishFinalConfirmationState() {
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index ce8a4ad..bbb317b 100644
--- a/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -17,7 +17,6 @@
 package com.android.settings;
 
 import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -27,10 +26,10 @@
 import android.os.PersistableBundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
 
+import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settingslib.RestrictedLockUtils;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -46,7 +45,10 @@
  * If this settings screen should be pin protected whenever
  * {@link RestrictionsManager.hasRestrictionsProvider()} returns true, pass in
  * {@link RESTRICT_IF_OVERRIDABLE} to the constructor instead of a restrictions key.
+ *
+ * @deprecated Use {@link RestrictedDashboardFragment} instead
  */
+@Deprecated
 public abstract class RestrictedSettingsFragment extends SettingsPreferenceFragment {
 
     protected static final String RESTRICT_IF_OVERRIDABLE = "restrict_if_overridable";
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index d74a07f..5209cc7 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -33,6 +33,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -74,6 +75,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_screen_pinning;
+    }
+
+    @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         ViewGroup parent = (ViewGroup) view.findViewById(android.R.id.list_container);
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 678a63b..736b85c 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import android.app.Activity;
@@ -65,6 +66,9 @@
 import com.android.settings.location.LocationPreferenceController;
 import com.android.settings.notification.LockScreenNotificationPreferenceController;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ManagedLockPasswordProvider;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
@@ -104,6 +108,7 @@
     static final String KEY_LOCKSCREEN_PREFERENCES = "lockscreen_preferences";
     private static final String KEY_ENCRYPTION_AND_CREDENTIALS = "encryption_and_credential";
     private static final String KEY_LOCATION_SCANNING  = "location_scanning";
+    private static final String KEY_LOCATION = "location";
 
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
     private static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
@@ -178,6 +183,12 @@
     }
 
     @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mLocationcontroller = new LocationPreferenceController(context, getLifecycle());
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -207,7 +218,6 @@
             mTrustAgentClickIntent = savedInstanceState.getParcelable(TRUST_AGENT_CLICK_INTENT);
         }
 
-        mLocationcontroller = new LocationPreferenceController(activity);
         mManageDeviceAdminPreferenceController
                 = new ManageDeviceAdminPreferenceController(activity);
         mEnterprisePrivacyPreferenceController
@@ -632,7 +642,7 @@
                     return false;
                 }
             }
-            startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
+            startFragment(this, ChooseLockGenericFragment.class.getName(),
                     R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
         } else if (KEY_UNLOCK_SET_OR_CHANGE_PROFILE.equals(key)) {
             if (Utils.startQuietModeDialogIfNecessary(this.getActivity(), mUm,
@@ -641,7 +651,7 @@
             }
             Bundle extras = new Bundle();
             extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
-            startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
+            startFragment(this, ChooseLockGenericFragment.class.getName(),
                     R.string.lock_settings_picker_title_profile,
                     SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE, extras);
         } else if (KEY_TRUST_AGENT.equals(key)) {
@@ -741,7 +751,7 @@
     private void unifyUncompliantLocks() {
         mLockPatternUtils.setSeparateProfileChallengeEnabled(mProfileChallengeUserId, false,
                 mCurrentProfilePassword);
-        startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
+        startFragment(this, ChooseLockGenericFragment.class.getName(),
                 R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
     }
 
@@ -749,7 +759,7 @@
         Bundle extras = new Bundle();
         extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
         startFragment(this,
-                "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
+                ChooseLockGenericFragment.class.getName(),
                 R.string.lock_settings_picker_title_profile,
                 SET_OR_CHANGE_LOCK_METHOD_REQUEST_PROFILE, extras);
     }
@@ -957,7 +967,7 @@
             // Duplicate in special app access
             keys.add(KEY_MANAGE_DEVICE_ADMIN);
             // Duplicates between parent-child
-            keys.add((new LocationPreferenceController(context)).getPreferenceKey());
+            keys.add(KEY_LOCATION);
             keys.add(KEY_ENCRYPTION_AND_CREDENTIALS);
             keys.add(KEY_SCREEN_PINNING);
             keys.add(KEY_LOCATION_SCANNING);
diff --git a/src/com/android/settings/SeekBarDialogPreference.java b/src/com/android/settings/SeekBarDialogPreference.java
index a40df55..507c551 100644
--- a/src/com/android/settings/SeekBarDialogPreference.java
+++ b/src/com/android/settings/SeekBarDialogPreference.java
@@ -23,6 +23,8 @@
 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 f6237ec..551b5e5 100644
--- a/src/com/android/settings/SelectableEditTextPreference.java
+++ b/src/com/android/settings/SelectableEditTextPreference.java
@@ -22,6 +22,8 @@
 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 1db185e..ed5180b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -22,6 +22,7 @@
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fingerprint.FingerprintEnrollIntroduction;
 import com.android.settings.fingerprint.FingerprintSettings;
+import com.android.settings.password.ChooseLockGeneric;
 
 /**
  * Top-level Settings activity
@@ -31,6 +32,7 @@
     /*
     * 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 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 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 static class StorageDashboardActivity extends SettingsActivity {}
     public static class UserAndAccountDashboardActivity extends SettingsActivity {}
     public static class SystemDashboardActivity extends SettingsActivity {}
-    public static class SupportDashboardActivity extends SettingsActivity {}
 
 }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 4045fd2..556dbfb 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -50,6 +50,7 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.Toolbar;
 
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.Settings.WifiSettingsActivity;
@@ -62,7 +63,8 @@
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.DynamicIndexableContentMonitor;
-import com.android.settings.search2.SearchFeatureProvider;
+import com.android.settings.search.SearchActivity;
+import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -75,7 +77,7 @@
 public class SettingsActivity extends SettingsDrawerActivity
         implements PreferenceManager.OnPreferenceTreeClickListener,
         PreferenceFragment.OnPreferenceStartFragmentCallback,
-        ButtonBarHandler, FragmentManager.OnBackStackChangedListener {
+        ButtonBarHandler, FragmentManager.OnBackStackChangedListener, OnClickListener {
 
     private static final String LOG_TAG = "Settings";
 
@@ -85,8 +87,6 @@
     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 @@
 
     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
@@ -231,15 +227,6 @@
     }
 
     @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")) {
             return new SharedPreferencesLogger(this, getMetricsTag());
@@ -282,7 +269,6 @@
         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 @@
         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 @@
             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 @@
     @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 @@
             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 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 @@
         }
 
         outState.putBoolean(SAVE_KEY_SHOW_HOME_AS_UP, mDisplayHomeAsUpEnabled);
-        outState.putBoolean(SAVE_KEY_SHOW_SEARCH, mDisplaySearch);
     }
 
     @Override
@@ -538,19 +529,13 @@
         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 @@
 
         return bitmap;
     }
-}
\ No newline at end of file
+
+    @Override
+    public void onClick(View v) {
+        Intent intent = new Intent(this, SearchActivity.class);
+        startActivity(intent);
+    }
+}
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 9d5e343..5f22545 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -49,8 +49,10 @@
 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 @@
         }
     }
 
-    private void updateEmptyView() {
+    @VisibleForTesting
+    void updateEmptyView() {
         if (mEmptyView == null) return;
         if (getPreferenceScreen() != null) {
+            final View listContainer = getActivity().findViewById(android.R.id.list_container);
             boolean show = (getPreferenceScreen().getPreferenceCount()
                     - (mHeader != null ? 1 : 0)
-                    - (mFooterPreferenceMixin.hasFooter() ? 1 : 0)) <= 0;
+                    - (mFooterPreferenceMixin.hasFooter() ? 1 : 0)) <= 0
+                    || (listContainer != null && listContainer.getVisibility() != View.VISIBLE);
             mEmptyView.setVisibility(show ? View.VISIBLE : View.GONE);
         } else {
             mEmptyView.setVisibility(View.VISIBLE);
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
deleted file mode 100644
index f2c24d0..0000000
--- a/src/com/android/settings/SetupChooseLockPassword.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-
-/**
- * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
- * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should
- * only overload base methods for minor theme and behavior differences specific to Setup Wizard.
- * Other changes should be done to ChooseLockPassword class instead and let this class inherit
- * those changes.
- */
-public class SetupChooseLockPassword extends ChooseLockPassword {
-
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt,
-            boolean confirmCredentials) {
-        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength,
-                maxLength, requirePasswordToDecrypt, confirmCredentials);
-        intent.setClass(context, SetupChooseLockPassword.class);
-        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
-        return intent;
-    }
-
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt, String password) {
-        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
-                requirePasswordToDecrypt, password);
-        intent.setClass(context, SetupChooseLockPassword.class);
-        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
-        return intent;
-    }
-
-    public static Intent createIntent(Context context, int quality,
-            int minLength, final int maxLength, boolean requirePasswordToDecrypt, long challenge) {
-        Intent intent = ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
-                requirePasswordToDecrypt, challenge);
-        intent.setClass(context, SetupChooseLockPassword.class);
-        intent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false);
-        return intent;
-    }
-
-    @Override
-    protected boolean isValidFragment(String fragmentName) {
-        return SetupChooseLockPasswordFragment.class.getName().equals(fragmentName);
-    }
-
-    @Override
-    /* package */ Class<? extends Fragment> getFragmentClass() {
-        return SetupChooseLockPasswordFragment.class;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstance) {
-        super.onCreate(savedInstance);
-        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
-        layout.setFitsSystemWindows(false);
-    }
-
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
-    public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
-
-        @Override
-        protected Intent getRedactionInterstitialIntent(Context context) {
-            // Setup wizard's redaction interstitial is deferred to optional step. Enable that
-            // optional step if the lock screen was set up.
-            SetupRedactionInterstitial.setEnabled(context, true);
-            return null;
-        }
-    }
-}
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
deleted file mode 100644
index 762d3b3..0000000
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ /dev/null
@@ -1,82 +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.UserHandle;
-
-/**
- * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
- * from ChooseLockPattern 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 ChooseLockPattern class instead and let this class inherit
- * those changes.
- */
-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;
-    }
-
-    @Override
-    protected boolean isValidFragment(String fragmentName) {
-        return SetupChooseLockPatternFragment.class.getName().equals(fragmentName);
-    }
-
-    @Override
-    /* package */ Class<? extends Fragment> getFragmentClass() {
-        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
-        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 4f30cc0..989cc2b 100644
--- a/src/com/android/settings/SetupEncryptionInterstitial.java
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.widget.LinearLayout;
 
@@ -55,12 +54,6 @@
     }
 
     @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);
         LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index 321040e..ac1db15 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -60,12 +60,6 @@
         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 a0a3719..d53abae 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 9475f45..708e17f 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -400,7 +400,7 @@
     private void updateState(String[] available, String[] tethered,
             String[] errored) {
         updateUsbState(available, tethered, errored);
-        updateBluetoothState(available, tethered, errored);
+        updateBluetoothState();
     }
 
 
@@ -431,41 +431,18 @@
         }
 
         if (usbTethered) {
-            mUsbTether.setSummary(R.string.usb_tethering_active_subtext);
             mUsbTether.setEnabled(!mDataSaverEnabled);
             mUsbTether.setChecked(true);
         } else if (usbAvailable) {
-            if (usbError == ConnectivityManager.TETHER_ERROR_NO_ERROR) {
-                mUsbTether.setSummary(R.string.usb_tethering_available_subtext);
-            } else {
-                mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
-            }
             mUsbTether.setEnabled(!mDataSaverEnabled);
             mUsbTether.setChecked(false);
-        } else if (usbErrored) {
-            mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
-            mUsbTether.setEnabled(false);
-            mUsbTether.setChecked(false);
-        } else if (mMassStorageActive) {
-            mUsbTether.setSummary(R.string.usb_tethering_storage_active_subtext);
-            mUsbTether.setEnabled(false);
-            mUsbTether.setChecked(false);
         } else {
-            mUsbTether.setSummary(R.string.usb_tethering_unavailable_subtext);
             mUsbTether.setEnabled(false);
             mUsbTether.setChecked(false);
         }
     }
 
-    private void updateBluetoothState(String[] available, String[] tethered,
-            String[] errored) {
-        boolean bluetoothErrored = false;
-        for (String s: errored) {
-            for (String regex : mBluetoothRegexs) {
-                if (s.matches(regex)) bluetoothErrored = true;
-            }
-        }
-
+    private void updateBluetoothState() {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         if (adapter == null) {
             return;
@@ -473,34 +450,17 @@
         int btState = adapter.getState();
         if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
             mBluetoothTether.setEnabled(false);
-            mBluetoothTether.setSummary(R.string.bluetooth_turning_off);
         } else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
             mBluetoothTether.setEnabled(false);
-            mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
         } else {
             BluetoothPan bluetoothPan = mBluetoothPan.get();
             if (btState == BluetoothAdapter.STATE_ON && bluetoothPan != null
                     && bluetoothPan.isTetheringOn()) {
                 mBluetoothTether.setChecked(true);
                 mBluetoothTether.setEnabled(!mDataSaverEnabled);
-                int bluetoothTethered = bluetoothPan.getConnectedDevices().size();
-                if (bluetoothTethered > 1) {
-                    String summary = getString(
-                            R.string.bluetooth_tethering_devices_connected_subtext,
-                            bluetoothTethered);
-                    mBluetoothTether.setSummary(summary);
-                } else if (bluetoothTethered == 1) {
-                    mBluetoothTether.setSummary(
-                            R.string.bluetooth_tethering_device_connected_subtext);
-                } else if (bluetoothErrored) {
-                    mBluetoothTether.setSummary(R.string.bluetooth_tethering_errored_subtext);
-                } else {
-                    mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext);
-                }
             } else {
                 mBluetoothTether.setEnabled(!mDataSaverEnabled);
                 mBluetoothTether.setChecked(false);
-                mBluetoothTether.setSummary(R.string.bluetooth_tethering_off_subtext);
             }
         }
     }
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java
index 2f4660e..0e5cd2c 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/TrustAgentSettings.java
@@ -35,7 +35,6 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.trustagent.TrustAgentManager;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
@@ -79,6 +78,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_trust_agent;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         mDpm = getActivity().getSystemService(DevicePolicyManager.class);
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 8a77fea..5371ca4 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -943,6 +943,8 @@
         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 @@
             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 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 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 @@
         }
     }
 
-
-
     private static boolean isVolumeValid(VolumeInfo volume) {
         return (volume != null) && (volume.getType() == VolumeInfo.TYPE_PRIVATE)
                 && volume.isMountedReadable();
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 78f9de6..cb661ed 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -152,7 +152,9 @@
 
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
         setEmptyView(mEmptyView);
-        mEmptyView.setText(R.string.wifi_calling_off_explanation);
+        String emptyViewText = activity.getString(R.string.wifi_calling_off_explanation)
+                + activity.getString(R.string.wifi_calling_off_explanation_2);
+        mEmptyView.setText(emptyViewText);
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index e0d2c69..0a6932f 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -55,7 +55,7 @@
         final View.OnTouchListener filterTouchListener = (View v, MotionEvent event) -> {
             // Filter obscured touches by consuming them.
             if (((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED) != 0)
-                || ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0)) {
+                    || ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0)) {
                 if (event.getAction() == MotionEvent.ACTION_UP) {
                     Toast.makeText(v.getContext(), R.string.touch_filtered_warning,
                             Toast.LENGTH_SHORT).show();
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 342b384..0766b1a 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -211,6 +211,18 @@
 
     private DevicePolicyManager mDpm;
 
+    /**
+     * Check if the color transforms are color accelerated. Some transforms are experimental only
+     * on non-accelerated platforms due to the performance implications.
+     *
+     * @param context The current context
+     * @return
+     */
+    public static boolean isColorTransformAccelerated(Context context) {
+        return context.getResources()
+                .getBoolean(com.android.internal.R.bool.config_setColorTransformAccelerated);
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.ACCESSIBILITY;
@@ -618,11 +630,6 @@
         updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
     }
 
-    private boolean isColorTransformAccelerated(Context context) {
-        return context.getResources()
-                .getBoolean(com.android.internal.R.bool.config_setColorTransformAccelerated);
-    }
-
     private void updateMagnificationSummary(Preference pref) {
         final boolean tripleTapEnabled = Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
@@ -767,10 +774,9 @@
 
         @Override
         public List<String> getNonIndexableKeys(Context context) {
-            List<String> keys = new ArrayList<>();
+            List<String> keys = super.getNonIndexableKeys(context);
             // Duplicates in Display
             keys.add(FONT_SIZE_PREFERENCE_SCREEN);
-            // TODO (b/37741509) Remove this non-indexble key when bug is resolved.
             keys.add(DisplaySettings.KEY_DISPLAY_SIZE);
 
             return keys;
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index 21ead46..da47a95 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -52,6 +52,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_accessibility_shortcut;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/accessibility/ListDialogPreference.java b/src/com/android/settings/accessibility/ListDialogPreference.java
index a67bf48..cfb77bb 100644
--- a/src/com/android/settings/accessibility/ListDialogPreference.java
+++ b/src/com/android/settings/accessibility/ListDialogPreference.java
@@ -31,7 +31,7 @@
 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 68979ad..9715559 100644
--- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
@@ -31,11 +31,9 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.PreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -68,6 +66,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_magnification;
+    }
+
+    @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index 38e6b0f..ae57f06 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -16,7 +16,6 @@
 package com.android.settings.accessibility;
 
 import static android.content.DialogInterface.BUTTON_POSITIVE;
-
 import static com.android.settings.Utils.setOverlayAllowed;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index da4bdcf..976a743 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.accessibility;
 
-import static com.android.settings.Utils.setOverlayAllowed;
-
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -38,19 +36,20 @@
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.ConfirmDeviceCredentialActivity;
 import com.android.settings.R;
+import com.android.settings.password.ConfirmDeviceCredentialActivity;
 import com.android.settings.widget.ToggleSwitch;
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.List;
 
+import static com.android.settings.Utils.setOverlayAllowed;
+
 public class ToggleAccessibilityServicePreferenceFragment
         extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
 
@@ -85,14 +84,6 @@
         // Do not call super. We don't want to see the "Help & feedback" option on this page so as
         // not to confuse users who think they might be able to send feedback about a specific
         // accessibility service from this page.
-
-        // We still want to show the "Settings" menu.
-        if (mSettingsTitle != null && mSettingsIntent != null) {
-            MenuItem menuItem = menu.add(mSettingsTitle);
-            menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            menuItem.setIntent(mSettingsIntent);
-        }
-
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 6b2c6c8..16df03e 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -26,7 +26,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.widget.SwitchBar;
 
 
@@ -105,6 +105,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_autoclick;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 3813641..64d38af 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -42,6 +42,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_color_correction;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -49,6 +54,10 @@
 
         mType = (ListPreference) findPreference("type");
 
+        if (!AccessibilitySettings.isColorTransformAccelerated(getActivity())) {
+            mFooterPreferenceMixin.createFooterPreference().setTitle(
+                    R.string.accessibility_display_daltonizer_preference_subtitle);
+        }
         initPreferences();
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 6a4eb5f..f66fb4d 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -42,7 +42,6 @@
     protected ToggleSwitch mToggleSwitch;
 
     protected String mPreferenceKey;
-    protected Preference mSummaryPreference;
 
     protected CharSequence mSettingsTitle;
     protected Intent mSettingsIntent;
@@ -53,36 +52,6 @@
         PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
                 getActivity());
         setPreferenceScreen(preferenceScreen);
-        mSummaryPreference = new Preference(getPrefContext()) {
-            @Override
-            public void onBindViewHolder(PreferenceViewHolder view) {
-                super.onBindViewHolder(view);
-                view.setDividerAllowedAbove(false);
-                view.setDividerAllowedBelow(false);
-                final TextView summaryView = (TextView) view.findViewById(android.R.id.summary);
-                summaryView.setText(getSummary());
-                sendAccessibilityEvent(summaryView);
-            }
-
-            private void sendAccessibilityEvent(View view) {
-                // Since the view is still not attached we create, populate,
-                // and send the event directly since we do not know when it
-                // will be attached and posting commands is not as clean.
-                AccessibilityManager accessibilityManager =
-                        AccessibilityManager.getInstance(getActivity());
-                if (accessibilityManager.isEnabled()) {
-                    AccessibilityEvent event = AccessibilityEvent.obtain();
-                    event.setEventType(AccessibilityEvent.TYPE_VIEW_FOCUSED);
-                    view.onInitializeAccessibilityEvent(event);
-                    view.dispatchPopulateAccessibilityEvent(event);
-                    accessibilityManager.sendAccessibilityEvent(event);
-                }
-            }
-        };
-        mSummaryPreference.setSelectable(false);
-        mSummaryPreference.setPersistent(false);
-        mSummaryPreference.setLayoutResource(R.layout.text_description_preference);
-        preferenceScreen.addPreference(mSummaryPreference);
     }
 
     @Override
@@ -94,6 +63,16 @@
         mToggleSwitch = mSwitchBar.getSwitch();
 
         onProcessArguments(getArguments());
+
+        // Show the "Settings" menu as if it were a preference screen
+        if (mSettingsTitle != null && mSettingsIntent != null) {
+            PreferenceScreen preferenceScreen = getPreferenceScreen();
+            Preference settingsPref = new Preference(preferenceScreen.getContext());
+            settingsPref.setTitle(mSettingsTitle);
+            settingsPref.setIconSpaceReserved(true);
+            settingsPref.setIntent(mSettingsIntent);
+            preferenceScreen.addPreference(settingsPref);
+        }
     }
 
     @Override
@@ -111,16 +90,6 @@
 
     protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
 
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        if (mSettingsTitle != null && mSettingsIntent != null) {
-            MenuItem menuItem = menu.add(mSettingsTitle);
-            menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            menuItem.setIntent(mSettingsIntent);
-        }
-    }
-
     protected void onInstallSwitchBarToggleSwitch() {
         // Implement this to set a checked listener.
     }
@@ -145,11 +114,6 @@
     }
 
     protected void onProcessArguments(Bundle arguments) {
-        if (arguments == null) {
-            getPreferenceScreen().removePreference(mSummaryPreference);
-            return;
-        }
-
         // Key.
         mPreferenceKey = arguments.getString(AccessibilitySettings.EXTRA_PREFERENCE_KEY);
 
@@ -168,9 +132,7 @@
         if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) {
             final CharSequence summary = arguments.getCharSequence(
                     AccessibilitySettings.EXTRA_SUMMARY);
-            mSummaryPreference.setSummary(summary);
-        } else {
-            getPreferenceScreen().removePreference(mSummaryPreference);
+            mFooterPreferenceMixin.createFooterPreference().setTitle(summary);
         }
     }
 }
diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
index 293d2bf..c200d17 100644
--- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
@@ -73,6 +73,11 @@
     }
 
     @Override
+    public int getHelpResource() {
+        return R.string.help_url_font_size;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsEvent.ACCESSIBILITY_FONT_SIZE;
     }
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 0cdeff0..033d81b 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -146,7 +146,6 @@
         final PreferenceScreen preferenceScreen = getPreferenceManager().getPreferenceScreen();
         preferenceScreen.setOrderingAsAdded(false);
         mVideoPreference.setOrder(0);
-        mSummaryPreference.setOrder(1);
         mConfigWarningPreference.setOrder(2);
         preferenceScreen.addPreference(mVideoPreference);
         preferenceScreen.addPreference(mConfigWarningPreference);
diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
index 65959b4..3d853fe 100644
--- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -22,9 +22,8 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-
 import android.support.v7.preference.PreferenceScreen;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -45,13 +44,12 @@
     public static final String KEY_ACCOUNT_TYPE = "account_type";
     public static final String KEY_ACCOUNT_LABEL = "account_label";
     public static final String KEY_ACCOUNT_TITLE_RES = "account_title_res";
-    public static final String KEY_ACCOUNT_HEADER = "account_header";
     public static final String KEY_USER_HANDLE = "user_handle";
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     Account mAccount;
     private String mAccountLabel;
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     String mAccountType;
     private AccountSyncPreferenceController mAccountSynController;
     private RemoveAccountPreferenceController mRemoveAccountController;
@@ -99,6 +97,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_account_detail;
+    }
+
+    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.account_type_settings;
     }
@@ -110,6 +113,8 @@
         controllers.add(mAccountSynController);
         mRemoveAccountController = new RemoveAccountPreferenceController(context, this);
         controllers.add(mRemoveAccountController);
+        controllers.add(new AccountHeaderPreferenceController(
+                context, getLifecycle(), getActivity(), this /* host */, getArguments()));
         return controllers;
     }
 
@@ -127,8 +132,6 @@
 
     @VisibleForTesting
     void updateUi() {
-        final Preference headerPreference = findPreference(KEY_ACCOUNT_HEADER);
-        headerPreference.setTitle(mAccount.name);
         final Context context = getContext();
         UserHandle userHandle = null;
         Bundle args = getArguments();
@@ -136,14 +139,12 @@
             userHandle = args.getParcelable(KEY_USER_HANDLE);
         }
         final AuthenticatorHelper helper = new AuthenticatorHelper(context, userHandle, null);
-        headerPreference.setIcon(helper.getDrawableForType(context, mAccountType));
         final AccountTypePreferenceLoader accountTypePreferenceLoader =
-            new AccountTypePreferenceLoader(this, helper, userHandle);
-        PreferenceScreen prefs =
-            accountTypePreferenceLoader.addPreferencesForType(mAccountType, getPreferenceScreen());
+                new AccountTypePreferenceLoader(this, helper, userHandle);
+        PreferenceScreen prefs = accountTypePreferenceLoader.addPreferencesForType(
+                mAccountType, getPreferenceScreen());
         if (prefs != null) {
             accountTypePreferenceLoader.updatePreferenceIntents(prefs, mAccountType, mAccount);
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
new file mode 100644
index 0000000..5cbd1b0
--- /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 4820161..03a620b 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -47,14 +47,14 @@
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.search2.SearchFeatureProviderImpl;
+import com.android.settings.search.SearchFeatureProviderImpl;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/settings/accounts/AccountSyncPreferenceController.java b/src/com/android/settings/accounts/AccountSyncPreferenceController.java
index 0b095f7..2eee579 100644
--- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java
@@ -19,23 +19,31 @@
 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 @@
         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 4f92829..3e869fe 100644
--- a/src/com/android/settings/accounts/AccountTypePreference.java
+++ b/src/com/android/settings/accounts/AccountTypePreference.java
@@ -79,7 +79,6 @@
         mFragment = fragment;
         mFragmentArguments = fragmentArguments;
         mMetricsCategory = metricsCategory;
-        setWidgetLayoutResource(R.layout.account_type_preference);
 
         setKey(buildKey(account));
         setTitle(mTitle);
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 345f9fc..cca15c9 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.accounts;
 
+import static android.content.Intent.EXTRA_USER;
+
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
@@ -32,14 +34,12 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.Utils;
+import com.android.settings.password.ChooseLockSettingsHelper;
 
 import java.io.IOException;
-
-import static android.content.Intent.EXTRA_USER;
 /**
  * Entry point Activity for account setup. Works as follows
  *
diff --git a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
index 10e3610..a3dd94d 100644
--- a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
@@ -20,11 +20,11 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.users.UserCapabilities;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class AddUserWhenLockedPreferenceController extends PreferenceController
         implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnPause, OnResume {
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index fce88aa..fe6f7b4 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -44,10 +44,10 @@
 import com.android.settings.Utils;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.FooterPreference;
-import com.android.settings.widget.FooterPreferenceMixin;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.FooterPreferenceMixin;
 
 import com.google.android.collect.Maps;
 
diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
index 1221947..0c53041 100644
--- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
+++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
@@ -34,7 +34,7 @@
 public class EmergencyInfoPreferenceController extends PreferenceController {
 
     private static final String KEY_EMERGENCY_INFO = "emergency_info";
-    private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENGY_INFO";
+    private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENCY_INFO";
     private static final String PACKAGE_NAME_EMERGENCY = "com.android.emergency";
 
     public EmergencyInfoPreferenceController(Context context) {
diff --git a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
index a5a92ee..792b77a 100644
--- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
@@ -58,6 +58,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_user_and_account_dashboard;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new EmergencyInfoPreferenceController(context));
diff --git a/src/com/android/settings/applications/AccessibilityManagerWrapperImpl.java b/src/com/android/settings/applications/AccessibilityManagerWrapperImpl.java
new file mode 100644
index 0000000..4ebaea7
--- /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 0000000..6ce0a4a
--- /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 0000000..d0d99ea
--- /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 cce8b7d..b623801 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -18,8 +18,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
-
 import android.text.TextUtils;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
@@ -57,6 +57,15 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.APPLICATIONS_ADVANCED;
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new DefaultBrowserPreferenceController(context));
         controllers.add(new DefaultWorkBrowserPreferenceController(context));
@@ -68,11 +77,6 @@
         return controllers;
     }
 
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.APPLICATIONS_ADVANCED;
-    }
-
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
@@ -94,6 +98,11 @@
                             .getPreferenceKey());
                     return keys;
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context);
+                }
             };
 
     static class SummaryProvider implements SummaryLoader.SummaryProvider {
@@ -118,10 +127,10 @@
                 return;
             }
             CharSequence summary = concatSummaryText(
-                mDefaultSmsPreferenceController.getDefaultAppLabel(),
-                mDefaultBrowserPreferenceController.getDefaultAppLabel());
+                    mDefaultSmsPreferenceController.getDefaultAppLabel(),
+                    mDefaultBrowserPreferenceController.getDefaultAppLabel());
             summary = concatSummaryText(summary,
-                mDefaultPhonePreferenceController.getDefaultAppLabel());
+                    mDefaultPhonePreferenceController.getDefaultAppLabel());
             if (!TextUtils.isEmpty(summary)) {
                 mSummaryLoader.setSummary(this, summary);
             }
@@ -139,11 +148,11 @@
     }
 
     public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY =
-        new SummaryLoader.SummaryProviderFactory() {
-            @Override
-            public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                    SummaryLoader summaryLoader) {
-                return new AdvancedAppSettings.SummaryProvider(activity, summaryLoader);
-            }
-        };
+            new SummaryLoader.SummaryProviderFactory() {
+                @Override
+                public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                        SummaryLoader summaryLoader) {
+                    return new AdvancedAppSettings.SummaryProvider(activity, summaryLoader);
+                }
+            };
 }
diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
index 63e8be7..e0fc2b0 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 @@
     @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 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context);
+        final Activity activity = getActivity();
+        final Application app;
+        if (activity != null) {
+            app = activity.getApplication();
+        } else {
+            app = null;
+        }
+        return buildPreferenceControllers(context, app, this);
     }
 
-    private static List<PreferenceController> buildPreferenceControllers(Context context) {
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Application app, Fragment host) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new EmergencyBroadcastPreferenceController(context,
                 "app_and_notif_cell_broadcast_settings"));
         controllers.add(new SpecialAppAccessPreferenceController(context));
+        controllers.add(new AppPermissionsPreferenceController(context));
+        controllers.add(new RecentAppsPreferenceController(context, app, host));
         return controllers;
     }
 
@@ -80,7 +98,7 @@
 
                 @Override
                 public List<PreferenceController> getPreferenceControllers(Context context) {
-                    return buildPreferenceControllers(context);
+                    return buildPreferenceControllers(context, null, null /* host */);
                 }
 
                 @Override
diff --git a/src/com/android/settings/applications/AppCounter.java b/src/com/android/settings/applications/AppCounter.java
index 8eff526..8c7aed7 100644
--- a/src/com/android/settings/applications/AppCounter.java
+++ b/src/com/android/settings/applications/AppCounter.java
@@ -14,7 +14,6 @@
 
 package com.android.settings.applications;
 
-import android.app.AppGlobals;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java
deleted file mode 100644
index 804d645..0000000
--- a/src/com/android/settings/applications/AppHeaderController.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.annotation.IdRes;
-import android.annotation.UserIdInt;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.support.annotation.IntDef;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.settings.AppHeader;
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.applications.ApplicationsState;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-public class AppHeaderController {
-
-    @IntDef({ActionType.ACTION_NONE,
-            ActionType.ACTION_APP_INFO,
-            ActionType.ACTION_APP_PREFERENCE,
-            ActionType.ACTION_NOTIF_PREFERENCE})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface ActionType {
-        int ACTION_NONE = 0;
-        int ACTION_APP_INFO = 1;
-        int ACTION_APP_PREFERENCE = 2;
-        int ACTION_NOTIF_PREFERENCE = 3;
-    }
-
-    public static final String PREF_KEY_APP_HEADER = "pref_app_header";
-
-    private static final String TAG = "AppDetailFeature";
-
-    private final Context mContext;
-    private final Fragment mFragment;
-    private final int mMetricsCategory;
-    private final View mAppHeader;
-
-    private Drawable mIcon;
-    private CharSequence mLabel;
-    private CharSequence mSummary;
-    private String mPackageName;
-    private Intent mAppNotifPrefIntent;
-    @UserIdInt
-    private int mUid = UserHandle.USER_NULL;
-    @ActionType
-    private int mLeftAction;
-    @ActionType
-    private int mRightAction;
-
-    private boolean mIsInstantApp;
-
-    public AppHeaderController(Context context, Fragment fragment, View appHeader) {
-        mContext = context;
-        mFragment = fragment;
-        mMetricsCategory = FeatureFactory.getFactory(context).getMetricsFeatureProvider()
-                .getMetricsCategory(fragment);
-        if (appHeader != null) {
-            mAppHeader = appHeader;
-        } else {
-            mAppHeader = LayoutInflater.from(fragment.getContext())
-                    .inflate(R.layout.app_details, null /* root */);
-        }
-    }
-
-    public AppHeaderController setIcon(Drawable icon) {
-        if (icon != null) {
-            mIcon = icon.getConstantState().newDrawable(mContext.getResources());
-        }
-        return this;
-    }
-
-    public AppHeaderController setIcon(ApplicationsState.AppEntry appEntry) {
-        if (appEntry.icon != null) {
-            mIcon = appEntry.icon.getConstantState().newDrawable(mContext.getResources());
-        }
-        return this;
-    }
-
-    public AppHeaderController setLabel(CharSequence label) {
-        mLabel = label;
-        return this;
-    }
-
-    public AppHeaderController setLabel(ApplicationsState.AppEntry appEntry) {
-        mLabel = appEntry.label;
-        return this;
-    }
-
-    public AppHeaderController setSummary(CharSequence summary) {
-        mSummary = summary;
-        return this;
-    }
-
-    public AppHeaderController setSummary(PackageInfo packageInfo) {
-        if (packageInfo != null) {
-            mSummary = packageInfo.versionName;
-        }
-        return this;
-    }
-
-    public AppHeaderController setButtonActions(@ActionType int leftAction,
-            @ActionType int rightAction) {
-        mLeftAction = leftAction;
-        mRightAction = rightAction;
-        return this;
-    }
-
-    public AppHeaderController setPackageName(String packageName) {
-        mPackageName = packageName;
-        return this;
-    }
-
-    public AppHeaderController setUid(int uid) {
-        mUid = uid;
-        return this;
-    }
-
-    public AppHeaderController setAppNotifPrefIntent(Intent appNotifPrefIntent) {
-        mAppNotifPrefIntent = appNotifPrefIntent;
-        return this;
-    }
-
-    public AppHeaderController setIsInstantApp(boolean isInstantApp) {
-        this.mIsInstantApp = isInstantApp;
-        return this;
-    }
-
-    /**
-     * Done mutating appheader, rebinds everything and return a new {@link LayoutPreference}.
-     */
-    public LayoutPreference done(Activity activity, Context uiContext) {
-        final LayoutPreference pref = new LayoutPreference(uiContext, done(activity));
-        // Makes sure it's the first preference onscreen.
-        pref.setOrder(-1000);
-        pref.setKey(PREF_KEY_APP_HEADER);
-        return pref;
-    }
-
-    /**
-     * Done mutating appheader, rebinds everything (optionally skip rebinding buttons).
-     */
-    public View done(Activity activity, boolean rebindActions) {
-        styleActionBar(activity);
-        ImageView iconView = mAppHeader.findViewById(R.id.app_detail_icon);
-        if (iconView != null) {
-            iconView.setImageDrawable(mIcon);
-        }
-        setText(R.id.app_detail_title, mLabel);
-        setText(R.id.app_detail_summary, mSummary);
-        if (mIsInstantApp) {
-            setText(R.id.install_type,
-                    mAppHeader.getResources().getString(R.string.install_type_instant));
-        }
-
-        if (rebindActions) {
-            bindAppHeaderButtons();
-        }
-
-        return mAppHeader;
-    }
-
-    /**
-     * Only binds app header with button actions.
-     */
-    public AppHeaderController bindAppHeaderButtons() {
-        ImageButton leftButton = mAppHeader.findViewById(R.id.left_button);
-        ImageButton rightButton = mAppHeader.findViewById(R.id.right_button);
-
-        bindButton(leftButton, mLeftAction);
-        bindButton(rightButton, mRightAction);
-        return this;
-    }
-
-    public AppHeaderController styleActionBar(Activity activity) {
-        if (activity == null) {
-            Log.w(TAG, "No activity, cannot style actionbar.");
-            return this;
-        }
-        final ActionBar actionBar = activity.getActionBar();
-        if (actionBar == null) {
-            Log.w(TAG, "No actionbar, cannot style actionbar.");
-            return this;
-        }
-        actionBar.setBackgroundDrawable(
-                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));
-        actionBar.setElevation(0);
-
-        return this;
-    }
-
-    /**
-     * Done mutating appheader, rebinds everything.
-     */
-    @VisibleForTesting
-    View done(Activity activity) {
-        return done(activity, true /* rebindActions */);
-    }
-
-    private void bindButton(ImageButton button, @ActionType int action) {
-        if (button == null) {
-            return;
-        }
-        switch (action) {
-            case ActionType.ACTION_APP_INFO: {
-                if (mPackageName == null || mPackageName.equals(Utils.OS_PKG)
-                        || mUid == UserHandle.USER_NULL
-                        || !AppHeader.includeAppInfo(mFragment)) {
-                    button.setVisibility(View.GONE);
-                } else {
-                    button.setContentDescription(
-                            mContext.getString(R.string.application_info_label));
-                    button.setImageResource(com.android.settings.R.drawable.ic_info);
-                    button.setOnClickListener(v -> AppInfoBase.startAppInfoFragment(
-                            InstalledAppDetails.class, R.string.application_info_label,
-                            mPackageName, mUid, mFragment, 0 /* request */, mMetricsCategory));
-                    button.setVisibility(View.VISIBLE);
-                }
-                return;
-            }
-            case ActionType.ACTION_NOTIF_PREFERENCE: {
-                if (mAppNotifPrefIntent == null) {
-                    button.setVisibility(View.GONE);
-                } else {
-                    button.setOnClickListener(v -> mFragment.startActivity(mAppNotifPrefIntent));
-                    button.setVisibility(View.VISIBLE);
-                }
-                return;
-            }
-            case ActionType.ACTION_APP_PREFERENCE: {
-                final Intent intent = resolveIntent(
-                        new Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(mPackageName));
-                if (intent == null) {
-                    button.setVisibility(View.GONE);
-                    return;
-                }
-                button.setOnClickListener(v -> mFragment.startActivity(intent));
-                button.setVisibility(View.VISIBLE);
-                return;
-            }
-            case ActionType.ACTION_NONE: {
-                button.setVisibility(View.GONE);
-                return;
-            }
-        }
-    }
-
-    private Intent resolveIntent(Intent i) {
-        ResolveInfo result = mContext.getPackageManager().resolveActivity(i, 0);
-        if (result != null) {
-            return new Intent(i.getAction())
-                    .setClassName(result.activityInfo.packageName, result.activityInfo.name);
-        }
-        return null;
-    }
-
-    private void setText(@IdRes int id, CharSequence text) {
-        TextView textView = mAppHeader.findViewById(id);
-        if (textView != null) {
-            textView.setText(text);
-            textView.setVisibility(TextUtils.isEmpty(text) ? View.GONE : View.VISIBLE);
-        }
-    }
-}
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index a93bfbd..4af9bc6 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -35,6 +35,7 @@
 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;
@@ -291,7 +292,8 @@
         @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 6b1ef67..95877e9 100644
--- a/src/com/android/settings/applications/AppInfoWithHeader.java
+++ b/src/com/android/settings/applications/AppInfoWithHeader.java
@@ -16,17 +16,17 @@
 
 package com.android.settings.applications;
 
-import static com.android.settings.applications.AppHeaderController.ActionType;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.util.IconDrawableFactory;
 import android.util.Log;
 
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
 
+import static com.android.settings.widget.EntityHeaderController.ActionType;
+
 public abstract class AppInfoWithHeader extends AppInfoBase {
 
     private boolean mCreated;
@@ -41,9 +41,9 @@
         mCreated = true;
         if (mPackageInfo == null) return;
         final Activity activity = getActivity();
-        final Preference pref = FeatureFactory.getFactory(activity)
-                .getApplicationFeatureProvider(activity)
-                .newAppHeaderController(this, null /* appHeader */)
+        final Preference pref = EntityHeaderController
+                .newInstance(activity, this, null /* header */)
+                .setRecyclerView(getListView(), getLifecycle())
                 .setIcon(IconDrawableFactory.newInstance(activity)
                         .getBadgedIcon(mPackageInfo.applicationInfo))
                 .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
index e6c040b..b488af6 100644
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -28,6 +28,7 @@
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -43,6 +44,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.widget.EntityHeaderController;
 
 import java.util.List;
 
@@ -64,7 +66,7 @@
         final View appSnippet = mRootView.findViewById(R.id.app_snippet);
         CharSequence label = mPm.getApplicationLabel(pkgInfo.applicationInfo);
         Drawable icon = mPm.getApplicationIcon(pkgInfo.applicationInfo);
-        InstalledAppDetails.setupAppSnippet(appSnippet, label, icon,
+        setupAppSnippet(appSnippet, label, icon,
                 pkgInfo != null ? pkgInfo.versionName : null);
     }
 
@@ -191,4 +193,30 @@
             setIntentAndFinish(true, true);
         }
     }
+
+    /**
+     * @deprecated app info pages should use {@link EntityHeaderController} to show the app header.
+     */
+    void setupAppSnippet(View appSnippet, CharSequence label, Drawable icon,
+            CharSequence versionName) {
+        LayoutInflater.from(appSnippet.getContext()).inflate(R.layout.widget_text_views,
+                appSnippet.findViewById(android.R.id.widget_frame));
+
+        ImageView iconView = appSnippet.findViewById(android.R.id.icon);
+        iconView.setImageDrawable(icon);
+        // Set application name.
+        TextView labelView = appSnippet.findViewById(android.R.id.title);
+        labelView.setText(label);
+        // Version number of application
+        TextView appVersion = appSnippet.findViewById(R.id.widget_text1);
+
+        if (!TextUtils.isEmpty(versionName)) {
+            appVersion.setSelected(true);
+            appVersion.setVisibility(View.VISIBLE);
+            appVersion.setText(appSnippet.getContext().getString(R.string.version_text,
+                    String.valueOf(versionName)));
+        } else {
+            appVersion.setVisibility(View.INVISIBLE);
+        }
+    }
 }
diff --git a/src/com/android/settings/applications/AppPermissionsPreferenceController.java b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
new file mode 100644
index 0000000..57ec6d8
--- /dev/null
+++ b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionGroupInfo;
+import android.content.pm.PermissionInfo;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.Log;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import java.util.List;
+import java.util.Set;
+
+public class AppPermissionsPreferenceController extends PreferenceController {
+
+    private static final String TAG = "AppPermissionPrefCtrl";
+    private static final String KEY_APP_PERMISSION_GROUPS = "manage_perms";
+    private static final String[] PERMISSION_GROUPS = new String[] {
+        "android.permission-group.LOCATION",
+        "android.permission-group.MICROPHONE",
+        "android.permission-group.CAMERA",
+        "android.permission-group.SMS",
+        "android.permission-group.CONTACTS",
+        "android.permission-group.PHONE"};
+
+    private static final int NUM_PERMISSION_TO_USE = 3;
+
+    private final PackageManager mPackageManager;
+
+    public AppPermissionsPreferenceController(Context context) {
+        super(context);
+        mPackageManager = context.getPackageManager();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_APP_PERMISSION_GROUPS;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final String summary = getSummary();
+        if (summary != null) {
+            preference.setSummary(summary);
+        }
+    }
+
+    /*
+       Summary text looks like: Apps using Permission1, Permission2, Permission3
+       The 3 permissions are the first three from the list which any app has granted:
+       Location, Microphone, Camera, Sms, Contacts, and Phone
+     */
+    private String getSummary() {
+        final Set<String> permissions = getAllPermissionsInGroups();
+        Set<String> grantedPermissionGroups = getGrantedPermissionGroups(permissions);
+        CharSequence summary = null;
+        int count = 0;
+        for (String group : PERMISSION_GROUPS) {
+            if (!grantedPermissionGroups.contains(group)) {
+                continue;
+            }
+            summary = concatSummaryText(summary, group);
+            if (++count >= NUM_PERMISSION_TO_USE) {
+                break;
+            }
+        }
+        return count > 0 ? mContext.getString(R.string.app_permissions_summary, summary) : null;
+    }
+
+    private Set<String> getGrantedPermissionGroups(Set<String> permissions) {
+        ArraySet<String> grantedPermissionGroups = new ArraySet<>();
+        List<PackageInfo> installedPackages =
+            mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS);
+        for (PackageInfo installedPackage : installedPackages) {
+            if (installedPackage.permissions == null) {
+                continue;
+            }
+            for (PermissionInfo permissionInfo : installedPackage.permissions) {
+                if (permissions.contains(permissionInfo.name)
+                        && !grantedPermissionGroups.contains(permissionInfo.group)) {
+                    grantedPermissionGroups.add(permissionInfo.group);
+                }
+            }
+        }
+        return grantedPermissionGroups;
+    }
+
+    private CharSequence concatSummaryText(CharSequence currentSummary, String permission) {
+        final CharSequence label = getPermissionGroupLabel(permission);
+        if (TextUtils.isEmpty(currentSummary)) {
+            return label;
+        }
+        return mContext.getString(R.string.join_many_items_middle, currentSummary, label);
+    }
+
+    private CharSequence getPermissionGroupLabel(String group) {
+        try {
+            final PermissionGroupInfo groupInfo = mPackageManager.getPermissionGroupInfo(group, 0);
+            return groupInfo.loadLabel(mPackageManager);
+        } catch (NameNotFoundException e) {
+            Log.e(TAG, "Error getting permissions label.", e);
+        }
+        return group;
+    }
+
+    private Set<String> getAllPermissionsInGroups() {
+        ArraySet<String> result = new ArraySet<>();
+        for (String group : PERMISSION_GROUPS) {
+            try {
+                final List<PermissionInfo> permissions =
+                    mPackageManager.queryPermissionsByGroup(group, 0);
+                for (PermissionInfo permissionInfo : permissions) {
+                    result.add(permissionInfo.name);
+                }
+            } catch (NameNotFoundException e) {
+                Log.e(TAG, "Error getting permissions in group "+group, e);
+            }
+        }
+        return result;
+    }
+}
diff --git a/src/com/android/settings/applications/ApplicationFeatureProvider.java b/src/com/android/settings/applications/ApplicationFeatureProvider.java
index 27cac64..eae23d1 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProvider.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProvider.java
@@ -29,14 +29,8 @@
 public interface ApplicationFeatureProvider {
 
     /**
-     * Returns a new {@link AppHeaderController} instance to customize app header.
-     */
-    AppHeaderController newAppHeaderController(Fragment fragment, View appHeader);
-
-    /**
-     *
-     *  Returns a new {@link InstantAppButtonsController} instance for showing buttons
-     *  only relevant to instant apps.
+     * Returns a new {@link InstantAppButtonsController} instance for showing buttons
+     * only relevant to instant apps.
      */
     InstantAppButtonsController newInstantAppButtonsController(Fragment fragment,
             View view, InstantAppButtonsController.ShowDialogDelegate showDialogDelegate);
@@ -45,7 +39,7 @@
      * Calculates the total number of apps installed on the device via policy in the current user
      * and all its managed profiles.
      *
-     * @param async Whether to count asynchronously in a background thread
+     * @param async    Whether to count asynchronously in a background thread
      * @param callback The callback to invoke with the result
      */
     void calculateNumberOfPolicyInstalledApps(boolean async, NumberOfAppsCallback callback);
@@ -62,10 +56,10 @@
      * Asynchronously calculates the total number of apps installed in the current user and all its
      * managed profiles that have been granted one or more of the given permissions by the admin.
      *
-     * @param permissions Only consider apps that have been granted one or more of these permissions
-     *        by the admin, either at run-time or install-time
-     * @param async Whether to count asynchronously in a background thread
-     * @param callback The callback to invoke with the result
+     * @param permissions Only consider apps that have been granted one or more of these
+     *                    permissions by the admin, either at run-time or install-time
+     * @param async       Whether to count asynchronously in a background thread
+     * @param callback    The callback to invoke with the result
      */
     void calculateNumberOfAppsWithAdminGrantedPermissions(String[] permissions, boolean async,
             NumberOfAppsCallback callback);
@@ -74,9 +68,9 @@
      * Asynchronously builds the list of apps installed in the current user and all its
      * managed profiles that have been granted one or more of the given permissions by the admin.
      *
-     * @param permissions Only consider apps that have been granted one or more of these permissions
-     *        by the admin, either at run-time or install-time
-     * @param callback The callback to invoke with the result
+     * @param permissions Only consider apps that have been granted one or more of these
+     *                    permissions by the admin, either at run-time or install-time
+     * @param callback    The callback to invoke with the result
      */
     void listAppsWithAdminGrantedPermissions(String[] permissions, ListOfAppsCallback callback);
 
@@ -86,10 +80,9 @@
      * given intent (e.g. open browser), even if the user has other apps installed that would also
      * be able to handle the intent.
      *
-     * @param userId ID of the user for which to find persistent preferred activities
-     * @param intent The intents for which to find persistent preferred activities
-     *
-     * @return the persistent preferred activites for the given intents, ordered first by user id,
+     * @param userId  ID of the user for which to find persistent preferred activities
+     * @param intents The intents for which to find persistent preferred activities
+     * @return the persistent preferred activities for the given intents, ordered first by user id,
      * then by package name
      */
     List<UserAppInfo> findPersistentPreferredActivities(@UserIdInt int userId, Intent[] intents);
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 685bd20..10b61c5 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -24,7 +24,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.os.RemoteException;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.ArraySet;
 import android.view.View;
@@ -54,11 +53,6 @@
     }
 
     @Override
-    public AppHeaderController newAppHeaderController(Fragment fragment, View appHeader) {
-        return new AppHeaderController(mContext, fragment, appHeader);
-    }
-
-    @Override
     public InstantAppButtonsController newInstantAppButtonsController(Fragment fragment,
             View view, InstantAppButtonsController.ShowDialogDelegate showDialogDelegate) {
         return new InstantAppButtonsController(mContext, fragment, view, showDialogDelegate);
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index be3c371..c5e6d77 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -24,16 +24,15 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
 
 /* Class to prompt for conversion of userdata to file based encryption
  */
-public class ConvertToFbe extends SettingsPreferenceFragment {
+public class ConvertToFbe extends InstrumentedFragment {
     static final String TAG = "ConvertToFBE";
     static final String CONVERT_FBE_EXTRA = "ConvertFBE";
     private static final int KEYGUARD_REQUEST = 55;
diff --git a/src/com/android/settings/applications/DrawOverlayDetails.java b/src/com/android/settings/applications/DrawOverlayDetails.java
index 72564bc..c6f3cc0 100644
--- a/src/com/android/settings/applications/DrawOverlayDetails.java
+++ b/src/com/android/settings/applications/DrawOverlayDetails.java
@@ -20,8 +20,6 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -206,33 +204,6 @@
 
     public static CharSequence getSummary(Context context, OverlayState overlayState) {
         return context.getString(overlayState.isPermissible() ?
-            R.string.system_alert_window_on : R.string.system_alert_window_off);
-    }
-
-    public static CharSequence getSummary(Context context, String pkg) {
-        // first check if pkg is a system pkg
-        PackageManager packageManager = context.getPackageManager();
-        int uid = -1;
-        try {
-            ApplicationInfo appInfo = packageManager.getApplicationInfo(pkg, 0);
-            uid = appInfo.uid;
-            if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                return context.getString(R.string.system_alert_window_on);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            // pkg doesn't even exist?
-            Log.w(LOG_TAG, "Package " + pkg + " not found", e);
-            return context.getString(R.string.system_alert_window_off);
-        }
-
-        AppOpsManager appOpsManager = (AppOpsManager) context.getSystemService(Context
-                .APP_OPS_SERVICE);
-        if (uid == -1) {
-            return context.getString(R.string.system_alert_window_off);
-        }
-
-        int mode = appOpsManager.noteOpNoThrow(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg);
-        return context.getString((mode == AppOpsManager.MODE_ALLOWED) ?
-                R.string.system_alert_window_on : R.string.system_alert_window_off);
+            R.string.app_permission_summary_allowed : R.string.app_permission_summary_not_allowed);
     }
 }
diff --git a/src/com/android/settings/applications/ExternalSourcesDetails.java b/src/com/android/settings/applications/ExternalSourcesDetails.java
index fe51a87..36ce8f8 100644
--- a/src/com/android/settings/applications/ExternalSourcesDetails.java
+++ b/src/com/android/settings/applications/ExternalSourcesDetails.java
@@ -15,11 +15,6 @@
  */
 package com.android.settings.applications;
 
-import static android.app.Activity.RESULT_CANCELED;
-import static android.app.Activity.RESULT_OK;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
 import android.app.AlertDialog;
 import android.app.AppOpsManager;
 import android.content.Context;
@@ -29,12 +24,16 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
+import static android.app.Activity.RESULT_CANCELED;
+import static android.app.Activity.RESULT_OK;
+
 public class ExternalSourcesDetails extends AppInfoWithHeader
         implements OnPreferenceChangeListener {
 
@@ -90,15 +89,12 @@
                 return context.getString(R.string.disabled);
         }
 
-        final InstallAppsState appsState;
-        if (entry.extraInfo instanceof InstallAppsState) {
-            appsState = (InstallAppsState) entry.extraInfo;
-        } else {
-            appsState = new AppStateInstallAppsBridge(context, null, null)
-                    .createInstallAppsStateFor(entry.info.packageName, entry.info.uid);
-        }
-        return context.getString(appsState.canInstallApps() ? R.string.external_source_trusted
-                : R.string.external_source_untrusted);
+        final InstallAppsState appsState = new AppStateInstallAppsBridge(context, null, null)
+                .createInstallAppsStateFor(entry.info.packageName, entry.info.uid);
+
+        return context.getString(appsState.canInstallApps()
+                ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed);
     }
 
     private void setCanInstallApps(boolean newState) {
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 3ee3c50..39e3255 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -37,7 +37,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.icu.text.ListFormatter;
 import android.net.INetworkStatsService;
 import android.net.INetworkStatsSession;
@@ -60,16 +59,12 @@
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.webkit.IWebViewUpdateService;
 import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.os.BatterySipper;
@@ -96,7 +91,7 @@
 import com.android.settings.notification.AppNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.NotificationBackend.AppRow;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.AppItem;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.AppUtils;
@@ -214,7 +209,7 @@
 
                 @Override
                 public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) {
-                    return new BatteryStatsHelperLoader(getContext(), args);
+                    return new BatteryStatsHelperLoader(getContext());
                 }
 
                 @Override
@@ -381,7 +376,7 @@
         }
 
         setHasOptionsMenu(true);
-        addPreferencesFromResource(R.xml.installed_app_details_ia);
+        addPreferencesFromResource(R.xml.installed_app_details);
         addDynamicPrefs();
         if (Utils.isBandwidthControlEnabled()) {
             INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
@@ -447,14 +442,13 @@
         final Activity activity = getActivity();
         mHeader = (LayoutPreference) findPreference(KEY_HEADER);
         mActionButtons = (LayoutPreference) findPreference(KEY_ACTION_BUTTONS);
-        FeatureFactory.getFactory(activity)
-                .getApplicationFeatureProvider(activity)
-                .newAppHeaderController(this, mHeader.findViewById(R.id.app_snippet))
+        EntityHeaderController.newInstance(activity, this, mHeader.findViewById(R.id.entity_header))
+                .setRecyclerView(getListView(), getLifecycle())
                 .setPackageName(mPackageName)
-                .setButtonActions(AppHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                        AppHeaderController.ActionType.ACTION_NONE)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
+                        EntityHeaderController.ActionType.ACTION_NONE)
                 .styleActionBar(activity)
-                .bindAppHeaderButtons();
+                .bindHeaderButtons();
         prepareUninstallAndStop();
 
         mNotificationPreference = findPreference(KEY_NOTIFICATION);
@@ -620,20 +614,18 @@
 
     // Utility method to set application label and icon.
     private void setAppLabelAndIcon(PackageInfo pkgInfo) {
-        final View appSnippet = mHeader.findViewById(R.id.app_snippet);
+        final View appSnippet = mHeader.findViewById(R.id.entity_header);
         mState.ensureIcon(mAppEntry);
         final Activity activity = getActivity();
         final boolean isInstantApp = AppUtils.isInstant(mPackageInfo.applicationInfo);
         final CharSequence summary =
                 isInstantApp ? null : getString(Utils.getInstallationStatus(mAppEntry.info));
-        FeatureFactory.getFactory(activity)
-            .getApplicationFeatureProvider(activity)
-            .newAppHeaderController(this, appSnippet)
-            .setLabel(mAppEntry)
-            .setIcon(mAppEntry)
-            .setSummary(summary)
-            .setIsInstantApp(isInstantApp)
-            .done(activity, false /* rebindActions */);
+        EntityHeaderController.newInstance(activity, this, appSnippet)
+                .setLabel(mAppEntry)
+                .setIcon(mAppEntry)
+                .setSummary(summary)
+                .setIsInstantApp(isInstantApp)
+                .done(activity, false /* rebindActions */);
         mVersionPreference.setSummary(getString(R.string.version_text, pkgInfo.versionName));
     }
 
@@ -1058,9 +1050,10 @@
         } 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 @@
         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 @@
         }
     }
 
-    /**
-     * @deprecated app info pages should use {@link AppHeaderController} to show the app header.
-     */
-    public static void setupAppSnippet(View appSnippet, CharSequence label, Drawable icon,
-            CharSequence versionName) {
-        LayoutInflater.from(appSnippet.getContext()).inflate(R.layout.widget_text_views,
-                (ViewGroup) appSnippet.findViewById(android.R.id.widget_frame));
-
-        ImageView iconView = (ImageView) appSnippet.findViewById(R.id.app_detail_icon);
-        iconView.setImageDrawable(icon);
-        // Set application name.
-        TextView labelView = (TextView) appSnippet.findViewById(R.id.app_detail_title);
-        labelView.setText(label);
-        // Version number of application
-        TextView appVersion = (TextView) appSnippet.findViewById(R.id.widget_text1);
-
-        if (!TextUtils.isEmpty(versionName)) {
-            appVersion.setSelected(true);
-            appVersion.setVisibility(View.VISIBLE);
-            appVersion.setText(appSnippet.getContext().getString(R.string.version_text,
-                    String.valueOf(versionName)));
-        } else {
-            appVersion.setVisibility(View.INVISIBLE);
-        }
-    }
-
     public static NetworkTemplate getTemplate(Context context) {
         if (DataUsageList.hasReadyMobileRadio(context)) {
             return NetworkTemplate.buildTemplateMobileWildcard();
diff --git a/src/com/android/settings/applications/LayoutPreference.java b/src/com/android/settings/applications/LayoutPreference.java
index b823f8e..f2bd183 100644
--- a/src/com/android/settings/applications/LayoutPreference.java
+++ b/src/com/android/settings/applications/LayoutPreference.java
@@ -19,6 +19,7 @@
 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 @@
 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 @@
         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 @@
         layout.addView(mRootView);
     }
 
-    public View findViewById(int id) {
+    public <T extends View> T findViewById(int id) {
         return mRootView.findViewById(id);
     }
 
diff --git a/src/com/android/settings/applications/LinearColorPreference.java b/src/com/android/settings/applications/LinearColorPreference.java
deleted file mode 100644
index e400f5e..0000000
--- a/src/com/android/settings/applications/LinearColorPreference.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-public class LinearColorPreference extends Preference {
-    float mRedRatio;
-    float mYellowRatio;
-    float mGreenRatio;
-    int mRedColor = 0xffaa5030;
-    int mYellowColor = 0xffaaaa30;
-    int mGreenColor = 0xff30aa50;
-    int mColoredRegions = LinearColorBar.REGION_ALL;
-    LinearColorBar.OnRegionTappedListener mOnRegionTappedListener;
-
-    public LinearColorPreference(Context context) {
-        super(context);
-        setLayoutResource(R.layout.preference_linearcolor);
-    }
-
-    public void setRatios(float red, float yellow, float green) {
-        mRedRatio = red;
-        mYellowRatio = yellow;
-        mGreenRatio = green;
-        notifyChanged();
-    }
-
-    public void setColors(int red, int yellow, int green) {
-        mRedColor = red;
-        mYellowColor = yellow;
-        mGreenColor = green;
-        notifyChanged();
-    }
-
-    public void setOnRegionTappedListener(LinearColorBar.OnRegionTappedListener listener) {
-        mOnRegionTappedListener = listener;
-        notifyChanged();
-    }
-
-    public void setColoredRegions(int regions) {
-        mColoredRegions = regions;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        LinearColorBar colors = (LinearColorBar)view.findViewById(
-                R.id.linear_color_bar);
-        colors.setShowIndicator(false);
-        colors.setColors(mRedColor, mYellowColor, mGreenColor);
-        colors.setRatios(mRedRatio, mYellowRatio, mGreenRatio);
-        colors.setColoredRegions(mColoredRegions);
-        colors.setOnRegionTappedListener(mOnRegionTappedListener);
-    }
-}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 76129b7..c0df50c 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -18,6 +18,7 @@
 
 import android.annotation.IdRes;
 import android.annotation.Nullable;
+import android.annotation.StringRes;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -148,7 +149,8 @@
     public static final int FILTER_APPS_COUNT = 13;  // This should always be the last entry
 
     // Mapping to string labels for the FILTER_APPS_* constants above.
-    public static final @IdRes int[] FILTER_LABELS = new int[FILTER_APPS_COUNT];
+    @IdRes
+    public static final int[] FILTER_LABELS = new int[FILTER_APPS_COUNT];
 
     // Mapping to filters for the FILTER_APPS_* constants above.
     public static final AppFilter[] FILTERS = new AppFilter[FILTER_APPS_COUNT];
@@ -212,8 +214,9 @@
     }
 
     // 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 @@
 
     // 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 @@
 
     @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 @@
         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 @@
     }
 
     @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 @@
     }
 
     @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 @@
     }
 
     @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 @@
     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 @@
                 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 @@
 
     @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 @@
         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 @@
                 && 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 @@
                 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 @@
     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 @@
             }
         };
 
+        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 @@
             // 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 @@
         }
 
         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 @@
 
             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 @@
         }
 
         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 @@
             }
         }
 
-        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 @@
                 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 @@
             = 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 61a011d..af822a0 100644
--- a/src/com/android/settings/applications/MusicViewHolderController.java
+++ b/src/com/android/settings/applications/MusicViewHolderController.java
@@ -19,6 +19,7 @@
 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 @@
     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 @@
 
     @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 c54363a..f290d43 100644
--- a/src/com/android/settings/applications/NotificationApps.java
+++ b/src/com/android/settings/applications/NotificationApps.java
@@ -17,7 +17,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.SummaryLoader;
@@ -29,23 +28,24 @@
  */
 public class NotificationApps extends ManageApplications {
 
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
+    public static class SummaryProvider implements SummaryLoader.SummaryProvider {
 
         private final Context mContext;
         private final SummaryLoader mLoader;
         private final NotificationBackend mNotificationBackend;
+        private final PackageManagerWrapper mPackageManager;
 
-        private SummaryProvider(Context context, SummaryLoader loader) {
+        public SummaryProvider(Context context, SummaryLoader loader) {
             mContext = context;
             mLoader = loader;
             mNotificationBackend = new NotificationBackend();
+            mPackageManager = new PackageManagerWrapperImpl(mContext.getPackageManager());
         }
 
         @Override
         public void setListening(boolean listening) {
             if (listening) {
-                new AppCounter(mContext,
-                        new PackageManagerWrapperImpl(mContext.getPackageManager())) {
+                new AppCounter(mContext, mPackageManager) {
                     @Override
                     protected void onCountComplete(int num) {
                         updateSummary(num);
diff --git a/src/com/android/settings/applications/PackageManagerWrapper.java b/src/com/android/settings/applications/PackageManagerWrapper.java
index ffa8e46..580b578 100644
--- a/src/com/android/settings/applications/PackageManagerWrapper.java
+++ b/src/com/android/settings/applications/PackageManagerWrapper.java
@@ -102,12 +102,15 @@
             ComponentName[] componentNames, ComponentName component);
 
     /**
+     * Calls {@code PackageManager.getPrimaryStorageCurrentVolume}
+     */
+    VolumeInfo getPrimaryStorageCurrentVolume();
+
+    /**
      * Calls {@code PackageManager.deletePackageAsUser}
      */
     void deletePackageAsUser(String packageName, IPackageDeleteObserver observer, int flags,
             int userId);
-    /**
-     * Calls {@code PackageManager.getPrimaryStorageCurrentVolume}
-     */
-    VolumeInfo getPrimaryStorageCurrentVolume();
+
+    int getPackageUidAsUser(String pkg, int userId) throws PackageManager.NameNotFoundException;
 }
diff --git a/src/com/android/settings/applications/PackageManagerWrapperImpl.java b/src/com/android/settings/applications/PackageManagerWrapperImpl.java
index 8349702..a47137c 100644
--- a/src/com/android/settings/applications/PackageManagerWrapperImpl.java
+++ b/src/com/android/settings/applications/PackageManagerWrapperImpl.java
@@ -94,13 +94,19 @@
     }
 
     @Override
+    public VolumeInfo getPrimaryStorageCurrentVolume() {
+        return mPm.getPrimaryStorageCurrentVolume();
+    }
+
+    @Override
     public void deletePackageAsUser(String packageName, IPackageDeleteObserver observer, int flags,
             int userId) {
         mPm.deletePackageAsUser(packageName, observer, flags, userId);
     }
 
     @Override
-    public VolumeInfo getPrimaryStorageCurrentVolume() {
-        return mPm.getPrimaryStorageCurrentVolume();
+    public int getPackageUidAsUser(String pkg, int userId)
+            throws PackageManager.NameNotFoundException {
+        return mPm.getPackageUidAsUser(pkg, userId);
     }
 }
diff --git a/src/com/android/settings/applications/PictureInPictureDetails.java b/src/com/android/settings/applications/PictureInPictureDetails.java
index 41f006a..a886a3d 100644
--- a/src/com/android/settings/applications/PictureInPictureDetails.java
+++ b/src/com/android/settings/applications/PictureInPictureDetails.java
@@ -15,10 +15,6 @@
  */
 package com.android.settings.applications;
 
-import static android.app.AppOpsManager.MODE_ALLOWED;
-import static android.app.AppOpsManager.MODE_ERRORED;
-import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE;
-
 import android.app.AlertDialog;
 import android.app.AppOpsManager;
 import android.content.Context;
@@ -34,6 +30,10 @@
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
 
+import static android.app.AppOpsManager.MODE_ALLOWED;
+import static android.app.AppOpsManager.MODE_ERRORED;
+import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE;
+
 public class PictureInPictureDetails extends AppInfoWithHeader
         implements OnPreferenceChangeListener {
 
@@ -124,7 +124,8 @@
     static int getPreferenceSummary(Context context, int uid, String packageName) {
         final boolean enabled = PictureInPictureDetails.getEnterPipStateForPackage(context, uid,
                 packageName);
-        return enabled ? R.string.picture_in_picture_on : R.string.picture_in_picture_off;
+        return enabled ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index 6c0928c..b9c3826 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.applications;
 
-import static com.android.settings.applications.AppHeaderController.ActionType;
-
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -53,7 +51,7 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SummaryPreference;
 import com.android.settings.applications.ProcStatsEntry.Service;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.EntityHeaderController;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -61,6 +59,8 @@
 import java.util.HashMap;
 import java.util.List;
 
+import static com.android.settings.widget.EntityHeaderController.ActionType;
+
 public class ProcessStatsDetail extends SettingsPreferenceFragment {
 
     private static final String TAG = "ProcessStatsDetail";
@@ -126,19 +126,19 @@
             return;
         }
         final Activity activity = getActivity();
-        final Preference pref = FeatureFactory.getFactory(activity)
-            .getApplicationFeatureProvider(activity)
-            .newAppHeaderController(this, null /* appHeader */)
-            .setIcon(mApp.mUiTargetApp != null
-                ? IconDrawableFactory.newInstance(activity).getBadgedIcon(mApp.mUiTargetApp)
-                : new ColorDrawable(0))
-            .setLabel(mApp.mUiLabel)
-            .setPackageName(mApp.mPackage)
-            .setUid(mApp.mUiTargetApp != null
-                ? mApp.mUiTargetApp.uid
-                : UserHandle.USER_NULL)
-            .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE)
-            .done(activity, getPrefContext());
+        final Preference pref = EntityHeaderController
+                .newInstance(activity, this, null /* appHeader */)
+                .setRecyclerView(getListView(), getLifecycle())
+                .setIcon(mApp.mUiTargetApp != null
+                        ? IconDrawableFactory.newInstance(activity).getBadgedIcon(mApp.mUiTargetApp)
+                        : new ColorDrawable(0))
+                .setLabel(mApp.mUiLabel)
+                .setPackageName(mApp.mPackage)
+                .setUid(mApp.mUiTargetApp != null
+                        ? mApp.mUiTargetApp.uid
+                        : UserHandle.USER_NULL)
+                .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE)
+                .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }
 
diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index c00cd5f..cdb8a4c 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -103,6 +103,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_process_stats_summary;
+    }
+
+    @Override
     public boolean onPreferenceClick(Preference preference) {
         if (preference == mAppListPreference) {
             Bundle args = new Bundle();
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 72238f6..9f76fb2 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -96,6 +96,11 @@
     }
 
     @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 0000000..dd95605
--- /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 41352bb..6c99a2e 100644
--- a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
+++ b/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
@@ -22,10 +22,10 @@
 import android.text.TextUtils;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnCreate;
-import com.android.settings.core.lifecycle.events.OnSaveInstanceState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
 public class ResetAppPrefPreferenceController extends PreferenceController
         implements LifecycleObserver, OnCreate, OnSaveInstanceState {
diff --git a/src/com/android/settings/applications/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java
index d90ff18..58a1dce 100644
--- a/src/com/android/settings/applications/SpacePreference.java
+++ b/src/com/android/settings/applications/SpacePreference.java
@@ -17,6 +17,7 @@
 
 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 @@
     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 31f461c..069db76 100644
--- a/src/com/android/settings/applications/SpecialAccessSettings.java
+++ b/src/com/android/settings/applications/SpecialAccessSettings.java
@@ -14,20 +14,54 @@
 
 package com.android.settings.applications;
 
-import android.os.Bundle;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 
-public class SpecialAccessSettings extends SettingsPreferenceFragment {
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpecialAccessSettings extends DashboardFragment {
+
+    private static final String TAG = "SpecialAccessSettings";
 
     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        addPreferencesFromResource(R.xml.special_access);
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.special_access;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return null;
     }
 
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.SPECIAL_ACCESS;
     }
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.special_access;
+                    result.add(sir);
+                    return result;
+                }
+            };
 }
diff --git a/src/com/android/settings/applications/WriteSettingsDetails.java b/src/com/android/settings/applications/WriteSettingsDetails.java
index aea05b3..50e6948 100644
--- a/src/com/android/settings/applications/WriteSettingsDetails.java
+++ b/src/com/android/settings/applications/WriteSettingsDetails.java
@@ -20,8 +20,6 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -38,8 +36,6 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
-import java.util.List;
-
 public class WriteSettingsDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
         OnPreferenceClickListener {
 
@@ -182,47 +178,8 @@
     }
 
     public static CharSequence getSummary(Context context, WriteSettingsState writeSettingsState) {
-        return context.getString(writeSettingsState.isPermissible() ? R.string.write_settings_on :
-                R.string.write_settings_off);
-    }
-
-    public static CharSequence getSummary(Context context, String pkg) {
-        // first check if pkg is a system pkg
-        boolean isSystem = false;
-        PackageManager packageManager = context.getPackageManager();
-        try {
-            ApplicationInfo appInfo = packageManager.getApplicationInfo(pkg, 0);
-            if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                isSystem = true;
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            // pkg doesn't even exist?
-            Log.w(LOG_TAG, "Package " + pkg + " not found", e);
-            return context.getString(R.string.write_settings_off);
-        }
-
-        AppOpsManager appOpsManager = (AppOpsManager) context.getSystemService(Context
-                .APP_OPS_SERVICE);
-        List<AppOpsManager.PackageOps> packageOps = appOpsManager.getPackagesForOps(
-                APP_OPS_OP_CODE);
-        if (packageOps == null) {
-            return context.getString(R.string.write_settings_off);
-        }
-
-        int uid = isSystem ? 0 : -1;
-        for (AppOpsManager.PackageOps packageOp : packageOps) {
-            if (pkg.equals(packageOp.getPackageName())) {
-                uid = packageOp.getUid();
-                break;
-            }
-        }
-
-        if (uid == -1) {
-            return context.getString(R.string.write_settings_off);
-        }
-
-        int mode = appOpsManager.noteOpNoThrow(AppOpsManager.OP_WRITE_SETTINGS, uid, pkg);
-        return context.getString((mode == AppOpsManager.MODE_ALLOWED) ?
-                R.string.write_settings_on : R.string.write_settings_off);
+        return context.getString(writeSettingsState.isPermissible()
+                ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed);
     }
 }
diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
index 05bc8d6..4a8e9c2 100644
--- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
@@ -26,10 +26,10 @@
 
 import com.android.internal.app.AssistUtils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
index e44e70f..faee23d 100644
--- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
@@ -28,10 +28,10 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.app.AssistUtils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
index 21dfe19..fb7be629b 100644
--- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
@@ -26,10 +26,10 @@
 
 import com.android.internal.app.AssistUtils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
index 032fb13..3443a44 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -27,10 +27,10 @@
 import com.android.internal.app.AssistUtils;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java
index aa71c9a..4209a42 100644
--- a/src/com/android/settings/applications/assist/ManageAssist.java
+++ b/src/com/android/settings/applications/assist/ManageAssist.java
@@ -22,11 +22,11 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.gestures.AssistGesturePreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -72,7 +72,8 @@
             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 @@
                     keys.add(KEY_ASSIST);
                     return keys;
                 }
-
             };
 }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index a08711c..d3617ef 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -23,11 +23,11 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Pair;
 
-import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.applications.PackageManagerWrapperImpl;
@@ -63,6 +63,16 @@
     }
 
     @Override
+    protected void onRadioButtonConfirmed(String selectedKey) {
+        mMetricsFeatureProvider.action(getContext(),
+                MetricsEvent.ACTION_SETTINGS_UPDATE_DEFAULT_APP,
+                selectedKey,
+                Pair.create(MetricsEvent.FIELD_CONTEXT, getMetricsCategory()));
+
+        super.onRadioButtonConfirmed(selectedKey);
+    }
+
+    @Override
     public void bindPreferenceExtra(RadioButtonPreference pref,
             String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
         if (!(info instanceof DefaultAppInfo)) {
@@ -97,7 +107,7 @@
 
         @Override
         public int getMetricsCategory() {
-            return MetricsProto.MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
+            return MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
         }
 
         /**
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
index 5c0f9a3..219ce0f 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
@@ -18,16 +18,20 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ComponentInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.util.Log;
 
 import java.util.List;
 
 public class DefaultBrowserPreferenceController extends DefaultAppPreferenceController {
 
+    private static final String TAG = "BrowserPrefCtrl";
+
     static final Intent BROWSE_PROBE = new Intent()
             .setAction(Intent.ACTION_VIEW)
             .addCategory(Intent.CATEGORY_BROWSABLE)
@@ -60,9 +64,10 @@
     @Override
     protected DefaultAppInfo getDefaultAppInfo() {
         try {
+            final String packageName = mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId);
+            Log.d(TAG, "Get default browser package: " + packageName);
             return new DefaultAppInfo(mPackageManager,
-                    mPackageManager.getPackageManager().getApplicationInfo(
-                            mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId), 0));
+                    mPackageManager.getPackageManager().getApplicationInfo(packageName, 0));
         } catch (PackageManager.NameNotFoundException e) {
             return null;
         }
@@ -90,7 +95,12 @@
         // Resolve that intent and check that the handleAllWebDataURI boolean is set
         final List<ResolveInfo> list = getCandidates();
         if (list != null && list.size() == 1) {
-            return list.get(0).loadLabel(mPackageManager.getPackageManager()).toString();
+            final ResolveInfo info = list.get(0);
+            final String label = info.loadLabel(mPackageManager.getPackageManager()).toString();
+            final ComponentInfo cn = info.getComponentInfo();
+            final String packageName = cn == null ? null : cn.packageName;
+            Log.d(TAG, "Getting label for the only browser app: " + packageName + label);
+            return label;
         }
         return null;
     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
index 2e93876..a89766f 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
@@ -26,6 +26,8 @@
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 
+import com.android.settings.applications.PackageManagerWrapper;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -106,11 +108,10 @@
         return false;
     }
 
-    public static boolean isHomeDefault(String pkg, Context context) {
-        ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
-        PackageManager pm = context.getPackageManager();
+    public static boolean isHomeDefault(String pkg, PackageManagerWrapper pm) {
+        final ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
         ComponentName def = pm.getHomeActivities(homeActivities);
 
-        return def != null && def.getPackageName().equals(pkg);
+        return def == null || def.getPackageName().equals(pkg);
     }
 }
diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java
index f8bab3d..7ffc6cd 100644
--- a/src/com/android/settings/backup/BackupSettingsActivity.java
+++ b/src/com/android/settings/backup/BackupSettingsActivity.java
@@ -94,14 +94,12 @@
 
                     // Add the activity title
                     SearchIndexableRaw data = new SearchIndexableRaw(context);
-                    data.title = context.getResources().getString(R.string.privacy_settings_title);
-                    data.screenTitle = context.getResources().getString(
-                            R.string.privacy_settings_title);
-                    data.keywords = context.getResources().getString(
-                            R.string.keywords_backup);
+                    data.title = context.getString(R.string.privacy_settings_title);
+                    data.screenTitle = context.getString(R.string.settings_label);
+                    data.keywords = context.getString(R.string.keywords_backup);
                     data.intentTargetPackage = context.getPackageName();
                     data.intentTargetClass = BackupSettingsActivity.class.getName();
-                    data.intentAction = "android.intent.action.MAIN";
+                    data.intentAction = Intent.ACTION_MAIN;
                     data.key = BACKUP_SEARCH_INDEX_KEY;
                     result.add(data);
 
@@ -110,7 +108,7 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    final List<String> keys = new ArrayList<String>();
+                    final List<String> keys = super.getNonIndexableKeys(context);
 
                     // For non-primary user, no backup is available, so don't show it in search
                     // TODO: http://b/22388012
diff --git a/src/com/android/settings/bluetooth/AlwaysDiscoverable.java b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java
new file mode 100644
index 0000000..5d7cbd5
--- /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 0000000..bbc8d81
--- /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 0000000..73e9f31
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+/**
+ * This class provides common lifecycle and bluetooth device event registration for Bluetooth device
+ * details controllers.
+ */
+public abstract class BluetoothDetailsController extends PreferenceController
+        implements CachedBluetoothDevice.Callback, LifecycleObserver, OnPause, OnResume {
+
+    protected final Context mContext;
+    protected final PreferenceFragment mFragment;
+    protected final CachedBluetoothDevice mCachedDevice;
+
+    public BluetoothDetailsController(Context context, PreferenceFragment fragment,
+            CachedBluetoothDevice device, Lifecycle lifecycle) {
+        super(context);
+        mContext = context;
+        mFragment = fragment;
+        mCachedDevice = device;
+        lifecycle.addObserver(this);
+    }
+
+    @Override
+    public void onPause() {
+        mCachedDevice.unregisterCallback(this);
+    }
+
+    @Override
+    public void onResume() {
+        mCachedDevice.registerCallback(this);
+        refresh();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void onDeviceAttributesChanged() {
+        refresh();
+    }
+
+    @Override
+    public final void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        init(screen);
+    }
+
+    /**
+     * This is a method to do one-time initialization when the screen is first created, such as
+     * adding preferences.
+     * @param screen the screen where this controller's preferences should be added
+     */
+    protected abstract void init(PreferenceScreen screen);
+
+    /**
+     * This method is called when something about the bluetooth device has changed, and this object
+     * should update the preferences it manages based on the new state.
+     */
+    protected abstract void refresh();
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
new file mode 100644
index 0000000..5ec7c85
--- /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 0000000..dbcc5d6
--- /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 0000000..b0ed056
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settingslib.bluetooth.A2dpProfile;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.bluetooth.MapProfile;
+import com.android.settingslib.bluetooth.PanProfile;
+import com.android.settingslib.bluetooth.PbapServerProfile;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.List;
+
+/**
+ * This class adds switches for toggling the individual profiles that a Bluetooth device
+ * supports, such as "Phone audio", "Media audio", "Contact sharing", etc.
+ */
+public class BluetoothDetailsProfilesController extends BluetoothDetailsController
+        implements Preference.OnPreferenceClickListener {
+    private static final String KEY_PROFILES_GROUP = "bluetooth_profiles";
+
+    @VisibleForTesting
+    static final String HIGH_QUALITY_AUDIO_PREF_TAG = "A2dpProfileHighQualityAudio";
+
+    private LocalBluetoothManager mManager;
+    private LocalBluetoothProfileManager mProfileManager;
+    private CachedBluetoothDevice mCachedDevice;
+    private PreferenceCategory mProfilesContainer;
+
+    public BluetoothDetailsProfilesController(Context context, PreferenceFragment fragment,
+            LocalBluetoothManager manager, CachedBluetoothDevice device, Lifecycle lifecycle) {
+        super(context, fragment, device, lifecycle);
+        mManager = manager;
+        mProfileManager = mManager.getProfileManager();
+        mCachedDevice = device;
+        lifecycle.addObserver(this);
+    }
+
+    @Override
+    protected void init(PreferenceScreen screen) {
+        mProfilesContainer = (PreferenceCategory)screen.findPreference(getPreferenceKey());
+        // Call refresh here even though it will get called later in onResume, to avoid the
+        // list of switches appearing to "pop" into the page.
+        refresh();
+    }
+
+    /**
+     * Creates a switch preference for the particular profile.
+     *
+     * @param context The context to use when creating the SwitchPreference
+     * @param profile The profile for which the preference controls.
+     * @return A preference that allows the user to choose whether this profile
+     * will be connected to.
+     */
+    private SwitchPreference createProfilePreference(Context context,
+            LocalBluetoothProfile profile) {
+        SwitchPreference pref = new SwitchPreference(context);
+        pref.setKey(profile.toString());
+        pref.setTitle(profile.getNameResource(mCachedDevice.getDevice()));
+        pref.setOnPreferenceClickListener(this);
+        return pref;
+    }
+
+    /**
+     * Refreshes the state for an existing SwitchPreference for a profile.
+     */
+    private void refreshProfilePreference(SwitchPreference profilePref,
+            LocalBluetoothProfile profile) {
+        BluetoothDevice device = mCachedDevice.getDevice();
+        profilePref.setEnabled(!mCachedDevice.isBusy());
+        if (profile instanceof MapProfile) {
+            profilePref.setChecked(mCachedDevice.getMessagePermissionChoice()
+                    == CachedBluetoothDevice.ACCESS_ALLOWED);
+        } else if (profile instanceof PbapServerProfile) {
+            profilePref.setChecked(mCachedDevice.getPhonebookPermissionChoice()
+                    == CachedBluetoothDevice.ACCESS_ALLOWED);
+        } else if (profile instanceof PanProfile) {
+            profilePref.setChecked(profile.getConnectionStatus(device) ==
+                    BluetoothProfile.STATE_CONNECTED);
+        } else {
+            profilePref.setChecked(profile.isPreferred(device));
+        }
+
+        if (profile instanceof A2dpProfile) {
+            A2dpProfile a2dp = (A2dpProfile) profile;
+            SwitchPreference highQualityPref = (SwitchPreference) mProfilesContainer.findPreference(
+                    HIGH_QUALITY_AUDIO_PREF_TAG);
+            if (highQualityPref != null) {
+                if (a2dp.isPreferred(device) && a2dp.supportsHighQualityAudio(device)) {
+                    highQualityPref.setVisible(true);
+                    highQualityPref.setTitle(a2dp.getHighQualityAudioOptionLabel(device));
+                    highQualityPref.setChecked(a2dp.isHighQualityAudioEnabled(device));
+                    highQualityPref.setEnabled(!mCachedDevice.isBusy());
+                } else {
+                    highQualityPref.setVisible(false);
+                }
+            }
+        }
+    }
+
+    /**
+     * Helper method to enable a profile for a device.
+     */
+    private void enableProfile(LocalBluetoothProfile profile, BluetoothDevice device,
+            SwitchPreference profilePref) {
+        if (profile instanceof PbapServerProfile) {
+            mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
+            // We don't need to do the additional steps below for this profile.
+            return;
+        }
+        if (profile instanceof MapProfile) {
+            mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
+        }
+        profile.setPreferred(device, true);
+        mCachedDevice.connectProfile(profile);
+    }
+
+    /**
+     * Helper method to disable a profile for a device
+     */
+    private void disableProfile(LocalBluetoothProfile profile, BluetoothDevice device,
+            SwitchPreference profilePref) {
+        if (profile instanceof PbapServerProfile) {
+            mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
+            // We don't need to do the additional steps below for this profile.
+            return;
+        }
+        mCachedDevice.disconnect(profile);
+        profile.setPreferred(device, false);
+        if (profile instanceof MapProfile) {
+            mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);
+        }
+    }
+
+    /**
+     * When the pref for a bluetooth profile is clicked on, we want to toggle the enabled/disabled
+     * state for that profile.
+     */
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        LocalBluetoothProfile profile = mProfileManager.getProfileByName(preference.getKey());
+        if (profile == null) {
+            // It might be the PbapServerProfile, which is not stored by name.
+            PbapServerProfile psp = mManager.getProfileManager().getPbapProfile();
+            if (TextUtils.equals(preference.getKey(), psp.toString())) {
+                profile = psp;
+            } else {
+                return false;
+            }
+        }
+        SwitchPreference profilePref = (SwitchPreference) preference;
+        BluetoothDevice device = mCachedDevice.getDevice();
+        if (profilePref.isChecked()) {
+            enableProfile(profile, device, profilePref);
+        } else {
+            disableProfile(profile, device, profilePref);
+        }
+        refreshProfilePreference(profilePref, profile);
+        return true;
+    }
+
+
+    /**
+     * Helper to get the list of connectable and special profiles.
+     */
+    private List<LocalBluetoothProfile> getProfiles() {
+        List<LocalBluetoothProfile> result = mCachedDevice.getConnectableProfiles();
+
+        final int pbapPermission = mCachedDevice.getPhonebookPermissionChoice();
+        // Only provide PBAP cabability if the client device has requested PBAP.
+        if (pbapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
+            final PbapServerProfile psp = mManager.getProfileManager().getPbapProfile();
+            result.add(psp);
+        }
+
+        final MapProfile mapProfile = mManager.getProfileManager().getMapProfile();
+        final int mapPermission = mCachedDevice.getMessagePermissionChoice();
+        if (mapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
+            result.add(mapProfile);
+        }
+
+        return result;
+    }
+
+    /**
+     * This is a helper method to be called after adding a Preference for a profile. If that
+     * profile happened to be A2dp and the device supports high quality audio, it will add a
+     * separate preference for controlling whether to actually use high quality audio.
+     *
+     * @param profile the profile just added
+     */
+    private void maybeAddHighQualityAudioPref(LocalBluetoothProfile profile) {
+        if (!(profile instanceof A2dpProfile)) {
+            return;
+        }
+        BluetoothDevice device = mCachedDevice.getDevice();
+        A2dpProfile a2dp = (A2dpProfile) profile;
+        if (a2dp.supportsHighQualityAudio(device)) {
+            SwitchPreference highQualityAudioPref = new SwitchPreference(
+                    mProfilesContainer.getContext());
+            highQualityAudioPref.setKey(HIGH_QUALITY_AUDIO_PREF_TAG);
+            highQualityAudioPref.setVisible(false);
+            highQualityAudioPref.setOnPreferenceClickListener(clickedPref -> {
+                boolean enable = ((SwitchPreference) clickedPref).isChecked();
+                a2dp.setHighQualityAudioEnabled(mCachedDevice.getDevice(), enable);
+                return true;
+            });
+            mProfilesContainer.addPreference(highQualityAudioPref);
+        }
+    }
+
+    /**
+     * Refreshes the state of the switches for all profiles, possibly adding or removing switches as
+     * needed.
+     */
+    @Override
+    protected void refresh() {
+        for (LocalBluetoothProfile profile : getProfiles()) {
+            SwitchPreference pref = (SwitchPreference) mProfilesContainer.findPreference(
+                    profile.toString());
+            if (pref == null) {
+                pref = createProfilePreference(mProfilesContainer.getContext(), profile);
+                mProfilesContainer.addPreference(pref);
+                maybeAddHighQualityAudioPref(profile);
+            }
+            refreshProfilePreference(pref, profile);
+        }
+        for (LocalBluetoothProfile removedProfile : mCachedDevice.getRemovedProfiles()) {
+            SwitchPreference pref = (SwitchPreference) mProfilesContainer.findPreference(
+                    removedProfile.toString());
+            if (pref != null) {
+                mProfilesContainer.removePreference(pref);
+            }
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PROFILES_GROUP;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
new file mode 100644
index 0000000..259a5ff
--- /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 0000000..f156a5d
--- /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 7be6dd7..a216400 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -17,7 +17,6 @@
 package com.android.settings.bluetooth;
 
 import android.app.AlertDialog;
-import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -27,7 +26,6 @@
 import android.support.v7.preference.PreferenceViewHolder;
 import android.text.Html;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.Pair;
 import android.util.TypedValue;
 import android.widget.ImageView;
@@ -38,10 +36,6 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.GearPreference;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.HidProfile;
-import com.android.settingslib.bluetooth.LocalBluetoothProfile;
-
-import java.util.List;
 
 import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
 
@@ -63,18 +57,11 @@
     private String contentDescription = null;
 
     /* Talk-back descriptions for various BT icons */
-    Resources r = getContext().getResources();
-    public final String COMPUTER = r.getString(R.string.bluetooth_talkback_computer);
-    public final String INPUT_PERIPHERAL = r.getString(
-            R.string.bluetooth_talkback_input_peripheral);
-    public final String HEADSET = r.getString(R.string.bluetooth_talkback_headset);
-    public final String PHONE = r.getString(R.string.bluetooth_talkback_phone);
-    public final String IMAGING = r.getString(R.string.bluetooth_talkback_imaging);
-    public final String HEADPHONE = r.getString(R.string.bluetooth_talkback_headphone);
-    public final String BLUETOOTH = r.getString(R.string.bluetooth_talkback_bluetooth);
+    Resources mResources;
 
     public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice) {
         super(context, null);
+        mResources = getContext().getResources();
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
 
         if (sDimAlpha == Integer.MIN_VALUE) {
@@ -130,16 +117,11 @@
          * 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 @@
         }
     }
 
-    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 0000000..b64da26
--- /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 6c41f83..c0935ab 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -208,12 +208,7 @@
      */
     @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 @@
         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/OnOptionsItemSelected.java b/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
similarity index 60%
copy from src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
copy to src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
index b34b407..a6ae31c 100644
--- a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
+++ b/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
@@ -14,10 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.settings.core.lifecycle.events;
+package com.android.settings.bluetooth;
 
-import android.view.MenuItem;
+/**
+ * Feature provider for bluetooth feature
+ */
+public interface BluetoothFeatureProvider {
+    /**
+     * @return whether additional pairing page is enabled
+     */
+    boolean isPairingPageEnabled();
 
-public interface OnOptionsItemSelected {
-    boolean onOptionsItemSelected(MenuItem menuItem);
+    /**
+     * @return whether device details should be shown as a separate page (true) or a dialog (false)
+     */
+    boolean isDeviceDetailPageEnabled();
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java b/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java
new file mode 100644
index 0000000..8d9e1c4
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java
@@ -0,0 +1,17 @@
+package com.android.settings.bluetooth;
+
+/**
+ * Impl for bluetooth feature provider
+ */
+public class BluetoothFeatureProviderImpl implements BluetoothFeatureProvider {
+
+    @Override
+    public boolean isPairingPageEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isDeviceDetailPageEnabled() {
+        return false;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
new file mode 100644
index 0000000..c425cdc
--- /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 508d6c9..4d5692f 100644
--- a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
@@ -15,22 +15,27 @@
  */
 package com.android.settings.bluetooth;
 
+import android.app.Fragment;
 import android.content.Context;
+import android.os.UserHandle;
+import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.MasterSwitchController;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
 public class BluetoothMasterSwitchPreferenceController extends PreferenceController
         implements OnSummaryChangeListener,
@@ -43,19 +48,27 @@
     private BluetoothEnabler mBluetoothEnabler;
     private BluetoothSummaryUpdater mSummaryUpdater;
     private RestrictionUtils mRestrictionUtils;
+    private Fragment mFragment;
+    private SettingsActivity mActivity;
+    private BluetoothFeatureProvider mBluetoothFeatureProvider;
 
     public BluetoothMasterSwitchPreferenceController(Context context,
-            LocalBluetoothManager bluetoothManager) {
-        this(context, bluetoothManager, new RestrictionUtils());
+            LocalBluetoothManager bluetoothManager, Fragment fragment, SettingsActivity activity) {
+        this(context, bluetoothManager, new RestrictionUtils(), fragment, activity);
     }
 
     @VisibleForTesting
     public BluetoothMasterSwitchPreferenceController(Context context,
-            LocalBluetoothManager bluetoothManager, RestrictionUtils restrictionUtils) {
+            LocalBluetoothManager bluetoothManager, RestrictionUtils restrictionUtils,
+            Fragment fragment, SettingsActivity activity) {
         super(context);
         mBluetoothManager = bluetoothManager;
         mSummaryUpdater = new BluetoothSummaryUpdater(mContext, this, mBluetoothManager);
         mRestrictionUtils = restrictionUtils;
+        mFragment = fragment;
+        mActivity = activity;
+        mBluetoothFeatureProvider = FeatureFactory.getFactory(
+                mContext).getBluetoothFeatureProvider(mContext);
     }
 
     @Override
@@ -63,10 +76,20 @@
         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 @@
         return KEY_TOGGLE_BLUETOOTH;
     }
 
+    @Override
     public void onResume() {
         mSummaryUpdater.register(true);
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index 5a3bc36..25413fa 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -18,19 +18,14 @@
 
 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.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 @@
     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 @@
                 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 @@
             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 0000000..fee37d0
--- /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 7b8fc6c..f95ce46 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -17,6 +17,7 @@
 
 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.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 @@
         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 0000000..ab99aad
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+import android.os.UserHandle;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.R;
+
+
+/**
+ * Controller that shows and updates the bluetooth device name
+ */
+public class BluetoothPairingPreferenceController extends PreferenceController {
+    private static final String TAG = "BluetoothPairingPrefCtrl";
+
+    public static final String KEY_PAIRING = "pref_bt_pairing";
+    private PreferenceFragment mFragment;
+    private SettingsActivity mActivity;
+    private Preference mPreference;
+
+    public BluetoothPairingPreferenceController(Context context, PreferenceFragment fragment,
+            SettingsActivity activity) {
+        super(context);
+        mFragment = fragment;
+        mActivity = activity;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PAIRING;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_PAIRING.equals(preference.getKey())) {
+            mActivity.startPreferencePanelAsUser(mFragment, BluetoothPairingDetail.class.getName(),
+                    null, R.string.bluetooth_pairing_page_title, null,
+                    new UserHandle(UserHandle.myUserId()));
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Create pairing preference to jump to pairing page
+     *
+     * @return bluetooth preference that created in this method
+     */
+    public Preference createBluetoothPairingPreference(int order) {
+        mPreference = new Preference(mFragment.getPreferenceScreen().getContext());
+        mPreference.setKey(KEY_PAIRING);
+        mPreference.setIcon(R.drawable.ic_add);
+        mPreference.setOrder(order);
+        mPreference.setTitle(R.string.bluetooth_pairing_pref_title);
+
+        return mPreference;
+    }
+
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index dfa97f0..a0c805c 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.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 @@
  * 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;
+    @VisibleForTesting
+    static final String KEY_PAIRED_DEVICES = "paired_devices";
+    @VisibleForTesting
+    static final String KEY_FOOTER_PREF = "footer_preference";
 
-    /* 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
+    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 @@
     @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 @@
     }
 
     @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 @@
             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 @@
         }
 
         // Make the device only visible to connected devices.
-        mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+        if (mAlwaysDiscoverable != null) {
+            mAlwaysDiscoverable.stop();
+        }
 
         if (isUiRestricted()) {
             return;
         }
-
-        getActivity().unregisterReceiver(mReceiver);
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (mLocalAdapter == null) return;
-        // If the user is not allowed to configure bluetooth, do not show the menu.
-        if (isUiRestricted()) return;
-
-        boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
-        boolean isDiscovering = mLocalAdapter.isDiscovering();
-        int textId = isDiscovering ? R.string.bluetooth_searching_for_devices :
-                R.string.bluetooth_search_for_devices;
-        menu.add(Menu.NONE, MENU_ID_SCAN, 0, textId)
-                .setEnabled(bluetoothIsEnabled && !isDiscovering)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        menu.add(Menu.NONE, MENU_ID_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();
+                mPairedDevicesCategory.addPreference(mPairingPreference);
+                updateFooterPreference(mFooterPreference);
 
-                if (isUiRestricted() || numberOfPairedDevices <= 0) {
-                    if (preferenceScreen.findPreference(KEY_PAIRED_DEVICES) != null) {
-                        preferenceScreen.removePreference(mPairedDevicesCategory);
-                    }
-                } else {
-                    if (preferenceScreen.findPreference(KEY_PAIRED_DEVICES) == null) {
-                        preferenceScreen.addPreference(mPairedDevicesCategory);
-                    }
-                }
-
-                // Available devices category
-                addDeviceCategory(mAvailableDevicesCategory,
-                        R.string.bluetooth_preference_found_devices,
-                        BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, mInitialScanStarted);
-
-                if (!mInitialScanStarted) {
-                    startScanning();
-                }
-
-                final Resources res = getResources();
-                final Locale locale = res.getConfiguration().getLocales().get(0);
-                final BidiFormatter bidiFormatter = BidiFormatter.getInstance(locale);
-                mMyDevicePreference.setTitle(res.getString(
-                        R.string.bluetooth_is_visible_message,
-                        bidiFormatter.unicodeWrap(mLocalAdapter.getName())));
-
-                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 @@
 
             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 @@
                 }
             });
         }
-        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 @@
         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 @@
             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 @@
      */
     @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 @@
         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 @@
                     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 5a2dcb2..7d2cc18 100644
--- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
@@ -20,7 +20,7 @@
 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.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 @@
  * 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 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 @@
         if (devices == null || devices.isEmpty()) {
             return null;
         }
-
         for (BluetoothDevice device : devices) {
             if (device.isConnected()) {
                 deviceName = device.getName();
@@ -171,7 +172,14 @@
                 }
             }
         }
-
+        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 c132163..ca06e3c 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -19,12 +19,15 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceGroup;
+import android.text.BidiFormatter;
 import android.util.Log;
 
-import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settings.R;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -41,22 +44,26 @@
  * @see BluetoothSettings
  * @see DevicePickerFragment
  */
+// TODO: Refactor this fragment
 public abstract class DeviceListPreferenceFragment extends
-        RestrictedSettingsFragment implements BluetoothCallback {
+        RestrictedDashboardFragment implements BluetoothCallback {
 
     private static final String TAG = "DeviceListPreferenceFragment";
 
-    private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
     private static final String KEY_BT_SCAN = "bt_scan";
 
     private BluetoothDeviceFilter.Filter mFilter;
 
+    @VisibleForTesting
+    boolean mScanEnabled;
+
     BluetoothDevice mSelectedDevice;
 
     LocalBluetoothAdapter mLocalAdapter;
     LocalBluetoothManager mLocalManager;
 
-    private PreferenceGroup mDeviceListGroup;
+    @VisibleForTesting
+    PreferenceGroup mDeviceListGroup;
 
     final WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
             new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
@@ -85,17 +92,13 @@
         }
         mLocalAdapter = mLocalManager.getBluetoothAdapter();
 
-        addPreferencesForActivity();
+        initPreferencesFromPreferenceScreen();
 
-        mDeviceListGroup = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
+        mDeviceListGroup = (PreferenceCategory) findPreference(getDeviceListKey());
     }
 
-    void setDeviceListGroup(PreferenceGroup preferenceGroup) {
-        mDeviceListGroup = preferenceGroup;
-    }
-
-    /** Add preferences from the subclass. */
-    abstract void addPreferencesForActivity();
+    /** find and update preference that already existed in preference screen */
+    abstract void initPreferencesFromPreferenceScreen();
 
     @Override
     public void onStart() {
@@ -104,8 +107,6 @@
 
         mLocalManager.setForegroundActivity(getActivity());
         mLocalManager.getEventManager().registerCallback(this);
-
-        updateProgressUi(mLocalAdapter.isDiscovering());
     }
 
     @Override
@@ -121,7 +122,6 @@
     }
 
     void removeAllDevices() {
-        mLocalAdapter.stopScanning();
         mDevicePreferenceMap.clear();
         mDeviceListGroup.removeAll();
     }
@@ -156,6 +156,7 @@
         btPreference.onClicked();
     }
 
+    @Override
     public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
         if (mDevicePreferenceMap.get(cachedDevice) != null) {
             return;
@@ -201,6 +202,16 @@
         // Does nothing by default
     }
 
+    @VisibleForTesting
+    void updateFooterPreference(Preference myDevicePreference) {
+        final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+
+        myDevicePreference.setTitle(getString(
+                R.string.bluetooth_footer_mac_message,
+                bidiFormatter.unicodeWrap(mLocalAdapter.getAddress())));
+    }
+
+    @Override
     public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
         BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice);
         if (preference != null) {
@@ -208,21 +219,56 @@
         }
     }
 
+    @VisibleForTesting
+    void enableScanning() {
+        // LocalBluetoothAdapter already handles repeated scan requests
+        mLocalAdapter.startScanning(true);
+        mScanEnabled = true;
+    }
+
+    @VisibleForTesting
+    void disableScanning() {
+        mLocalAdapter.stopScanning();
+        mScanEnabled = false;
+    }
+
+    @Override
     public void onScanningStateChanged(boolean started) {
-        updateProgressUi(started);
-    }
-
-    private void updateProgressUi(boolean start) {
-        if (mDeviceListGroup instanceof BluetoothProgressCategory) {
-            ((BluetoothProgressCategory) mDeviceListGroup).setProgress(start);
+        if (!started && mScanEnabled) {
+            mLocalAdapter.startScanning(true);
         }
     }
 
-    public void onBluetoothStateChanged(int bluetoothState) {
-        if (bluetoothState == BluetoothAdapter.STATE_OFF) {
-            updateProgressUi(false);
+    @Override
+    public void onBluetoothStateChanged(int bluetoothState) {}
+
+    /**
+     * Add bluetooth device preferences to {@code preferenceGroup} which satisfy the {@code filter}
+     *
+     * This method will also (1) set the title for {@code preferenceGroup} and (2) change the
+     * default preferenceGroup and filter
+     * @param preferenceGroup
+     * @param titleId
+     * @param filter
+     * @param addCachedDevices
+     */
+    public void addDeviceCategory(PreferenceGroup preferenceGroup, int titleId,
+            BluetoothDeviceFilter.Filter filter, boolean addCachedDevices) {
+        cacheRemoveAllPrefs(preferenceGroup);
+        preferenceGroup.setTitle(titleId);
+        mDeviceListGroup = preferenceGroup;
+        setFilter(filter);
+        if (addCachedDevices) {
+            addCachedDevices();
         }
+        preferenceGroup.setEnabled(true);
+        removeCachedPrefs(preferenceGroup);
     }
 
     public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
+
+    /**
+     * Return the key of the {@link PreferenceGroup} that contains the bluetooth devices
+     */
+    public abstract String getDeviceListKey();
 }
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 39aca14..4af3732 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -23,63 +23,56 @@
 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";
+
+    @VisibleForTesting
+    BluetoothProgressCategory mAvailableDevicesCategory;
+
+    private boolean mNeedAuth;
+    private String mLaunchPackage;
+    private String mLaunchClass;
+    private boolean mScanAllowed;
 
     public DevicePickerFragment() {
         super(null /* Not tied to any user restrictions. */);
     }
 
-    private boolean mNeedAuth;
-    private String mLaunchPackage;
-    private String mLaunchClass;
-    private boolean mStartScanOnStart;
-
     @Override
-    void addPreferencesForActivity() {
-        addPreferencesFromResource(R.xml.device_picker);
-
+    void initPreferencesFromPreferenceScreen() {
         Intent intent = getActivity().getIntent();
         mNeedAuth = intent.getBooleanExtra(BluetoothDevicePicker.EXTRA_NEED_AUTH, false);
         setFilter(intent.getIntExtra(BluetoothDevicePicker.EXTRA_FILTER_TYPE,
                 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 @@
         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,13 +91,20 @@
         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();
         /* Check if any device was selected, if no device selected
@@ -118,7 +117,7 @@
 
     @Override
     void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
-        mLocalAdapter.stopScanning();
+        disableScanning();
         LocalBluetoothPreferences.persistSelectedDeviceInPicker(
                 getActivity(), mSelectedDevice.getAddress());
         if ((btPreference.getCachedDevice().getBondState() ==
@@ -130,14 +129,24 @@
         }
     }
 
+    @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 @@
         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 0000000..1f3a689
--- /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 0000000..029b974
--- /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 0000000..4e5acefe
--- /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 eb194f4..26edd84 100755
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -17,20 +17,28 @@
 package com.android.settings.bluetooth;
 
 import android.app.AlertDialog;
+import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Resources;
 import android.support.annotation.VisibleForTesting;
+import android.util.Pair;
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.HidProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothManager.BluetoothManagerCallback;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 import com.android.settingslib.bluetooth.Utils.ErrorListener;
 
+import java.util.List;
+
 /**
  * Utils is a helper class that contains constants for various
  * Android resource IDs, debug logging flags, and static methods
@@ -141,4 +149,52 @@
             com.android.settingslib.bluetooth.Utils.setErrorListener(mErrorListener);
         }
     };
+
+    static Pair<Integer, String> getBtClassDrawableWithDescription(Resources r,
+            CachedBluetoothDevice cachedDevice) {
+        BluetoothClass btClass = cachedDevice.getBtClass();
+        if (btClass != null) {
+            switch (btClass.getMajorDeviceClass()) {
+                case BluetoothClass.Device.Major.COMPUTER:
+                    return new Pair<Integer, String>(R.drawable.ic_bt_laptop,
+                           r.getString(R.string.bluetooth_talkback_computer));
+
+                case BluetoothClass.Device.Major.PHONE:
+                    return new Pair<Integer, String>(R.drawable.ic_bt_cellphone,
+                            r.getString(R.string.bluetooth_talkback_phone));
+
+                case BluetoothClass.Device.Major.PERIPHERAL:
+                    return new Pair<Integer, String>(HidProfile.getHidClassDrawable(btClass),
+                            r.getString(
+                                    R.string.bluetooth_talkback_input_peripheral));
+
+                case BluetoothClass.Device.Major.IMAGING:
+                    return new Pair<Integer, String>(R.drawable.ic_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 6a1c06c..52028b3 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -15,21 +15,25 @@
  */
 package com.android.settings.connecteddevice;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.provider.SearchIndexableResource;
+import android.support.annotation.VisibleForTesting;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.deviceinfo.UsbBackend;
 import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -51,6 +55,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_connected_devices;
+    }
+
+    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.connected_devices;
     }
@@ -67,13 +76,51 @@
         lifecycle.addObserver(mUsbPrefController);
         controllers.add(mUsbPrefController);
         final BluetoothMasterSwitchPreferenceController bluetoothPreferenceController =
-            new BluetoothMasterSwitchPreferenceController(
-                context, Utils.getLocalBtManager(context));
+                new BluetoothMasterSwitchPreferenceController(
+                        context, Utils.getLocalBtManager(context), this,
+                        (SettingsActivity) getActivity());
         lifecycle.addObserver(bluetoothPreferenceController);
         controllers.add(bluetoothPreferenceController);
         return controllers;
     }
 
+    @VisibleForTesting
+    static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+        private final NfcPreferenceController mNfcPreferenceController;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+            mNfcPreferenceController = new NfcPreferenceController(context);
+        }
+
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                if (mNfcPreferenceController.isAvailable()) {
+                    mSummaryLoader.setSummary(this,
+                            mContext.getString(R.string.connected_devices_dashboard_summary));
+                } else {
+                    mSummaryLoader.setSummary(this, mContext.getString(
+                            R.string.connected_devices_dashboard_no_nfc_summary));
+                }
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
     /**
      * For Search.
      */
@@ -89,9 +136,8 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
                     PackageManager pm = context.getPackageManager();
-                    final List<String> keys = new ArrayList<String>();
-
                     if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
                         keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
                         keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
diff --git a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
index a98f068..9c9ed12 100644
--- a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
@@ -26,10 +26,10 @@
 
 import com.android.settings.core.PreferenceController;
 import com.android.settings.R;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.deviceinfo.UsbBackend;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class UsbModePreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
index 8d98b50..df6ccd3 100644
--- a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
+++ b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
@@ -20,9 +20,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public abstract class DynamicAvailabilityPreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/core/InstrumentedActivity.java b/src/com/android/settings/core/InstrumentedActivity.java
index 891af5d..9b24756 100644
--- a/src/com/android/settings/core/InstrumentedActivity.java
+++ b/src/com/android/settings/core/InstrumentedActivity.java
@@ -18,7 +18,7 @@
 
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.core.lifecycle.ObservableActivity;
+import com.android.settingslib.core.lifecycle.ObservableActivity;
 
 /**
  * Instrumented activity that logs visibility state.
diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java
index 303d4d8..188dbde 100644
--- a/src/com/android/settings/core/InstrumentedFragment.java
+++ b/src/com/android/settings/core/InstrumentedFragment.java
@@ -21,9 +21,9 @@
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.core.lifecycle.ObservableFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.survey.SurveyMixin;
+import com.android.settingslib.core.lifecycle.ObservableFragment;
 
 public abstract class InstrumentedFragment extends ObservableFragment implements Instrumentable {
 
@@ -49,4 +49,4 @@
         mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
         super.onResume();
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index 746c10d..bfb69e7 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -22,9 +22,9 @@
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.core.lifecycle.ObservablePreferenceFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.survey.SurveyMixin;
+import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
 
 /**
  * Instrumented fragment that logs visibility state.
diff --git a/src/com/android/settings/core/PreferenceController.java b/src/com/android/settings/core/PreferenceController.java
index 002240d..2b3a7ab 100644
--- a/src/com/android/settings/core/PreferenceController.java
+++ b/src/com/android/settings/core/PreferenceController.java
@@ -18,7 +18,7 @@
 import android.content.Context;
 
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.search2.ResultPayload;
+import com.android.settings.search.ResultPayload;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index edf2b75..5def86e 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -18,14 +18,11 @@
 
 import com.android.settings.ApnEditor;
 import com.android.settings.ApnSettings;
-import com.android.settings.ChooseLockPassword;
-import com.android.settings.ChooseLockPattern;
 import com.android.settings.CryptKeeperSettings;
 import com.android.settings.DateTimeSettings;
 import com.android.settings.DeviceAdminSettings;
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
-import com.android.settings.DreamSettings;
 import com.android.settings.IccLockSettings;
 import com.android.settings.MasterClear;
 import com.android.settings.PrivacySettings;
@@ -60,6 +57,7 @@
 import com.android.settings.applications.VrListenerSettings;
 import com.android.settings.applications.WriteSettingsDetails;
 import com.android.settings.applications.assist.ManageAssist;
+import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.dashboard.SupportFragment;
@@ -75,6 +73,7 @@
 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.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 @@
             EnterprisePrivacySettings.class.getName(),
             WebViewAppPicker.class.getName(),
             LockscreenDashboardFragment.class.getName(),
+            BluetoothDeviceDetailsFragment.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -260,7 +263,7 @@
             Settings.SecuritySettingsActivity.class.getName(),
             Settings.AccessibilitySettingsActivity.class.getName(),
             Settings.SystemDashboardActivity.class.getName(),
-            Settings.SupportDashboardActivity.class.getName(),
+            SupportDashboardActivity.class.getName(),
             // Home page > Network & Internet
             Settings.WifiSettingsActivity.class.getName(),
             Settings.DataUsageSummaryActivity.class.getName(),
diff --git a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
index dd3c1cc..5a9ab56 100644
--- a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
+++ b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
@@ -18,8 +18,8 @@
 import android.content.Context;
 
 import com.android.settings.DialogCreatable;
-import com.android.settings.core.lifecycle.ObservableDialogFragment;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.ObservableDialogFragment;
 
 public abstract class InstrumentedDialogFragment extends ObservableDialogFragment
         implements Instrumentable {
diff --git a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
index d1c7c7a..b4e6158 100644
--- a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
+++ b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
@@ -20,7 +20,9 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -32,6 +34,8 @@
 
 public class SharedPreferencesLogger implements SharedPreferences {
 
+    private static final String LOG_TAG = "SharedPreferencesLogger";
+
     private final String mTag;
     private final Context mContext;
     private final MetricsFeatureProvider mMetricsFeature;
@@ -99,12 +103,12 @@
             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 @@
             return;
         }
         // TODO: Remove count logging to save some resource.
-        mMetricsFeature.count(mContext, prefKey + "|" + value, 1);
+        mMetricsFeature.count(mContext, buildCountName(prefKey, value), 1);
 
-        // Pref key exists in set, log it's change in metrics.
-        mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE,
-                Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey),
-                Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_VALUE, value));
+        final Pair<Integer, Object> valueData;
+        if (value instanceof Long) {
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE,
+                    value);
+        } else if (value instanceof Integer) {
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE,
+                    ((Integer) value).longValue());
+        } else if (value instanceof Boolean) {
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE,
+                    (Boolean) value ? 1L : 0L);
+        } else if (value instanceof Float) {
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE,
+                    value);
+        } else if (value instanceof String) {
+            valueData = Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_VALUE, value);
+        } else {
+            Log.w(LOG_TAG, "Tried to log unloggable object" + value);
+            valueData = null;
+        }
+        if (valueData != null) {
+            // Pref key exists in set, log it's change in metrics.
+            mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE,
+                    Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey),
+                    valueData);
+        }
     }
 
-    private void logPackageName(String key, String value) {
+    @VisibleForTesting
+    void logPackageName(String key, String value) {
         final String prefKey = mTag + "/" + key;
-        mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE,
+        mMetricsFeature.action(mContext, MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE, value,
                 Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, prefKey));
-        mMetricsFeature.action(mContext, MetricsEvent.ACTION_GENERIC_PACKAGE,
-                prefKey + "|" + value);
     }
 
     private void safeLogValue(String key, String value) {
         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 @@
 
         @Override
         public Editor putInt(String key, int value) {
-            logValue(key, String.valueOf(value));
+            logValue(key, value);
             return this;
         }
 
         @Override
         public Editor putLong(String key, long value) {
-            logValue(key, String.valueOf(value));
+            logValue(key, value);
             return this;
         }
 
         @Override
         public Editor putFloat(String key, float value) {
-            logValue(key, String.valueOf(value));
+            logValue(key, value);
             return this;
         }
 
         @Override
         public Editor putBoolean(String key, boolean value) {
-            logValue(key, String.valueOf(value));
+            logValue(key, value);
             return this;
         }
 
diff --git a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
index fcd32d1..8de35ad 100644
--- a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
+++ b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
@@ -22,11 +22,11 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.SettingsActivity;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnAttach;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnAttach;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
 
diff --git a/src/com/android/settings/core/lifecycle/Lifecycle.java b/src/com/android/settings/core/lifecycle/Lifecycle.java
deleted file mode 100644
index ef23688..0000000
--- a/src/com/android/settings/core/lifecycle/Lifecycle.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle;
-
-import android.annotation.UiThread;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.settings.core.lifecycle.events.OnAttach;
-import com.android.settings.core.lifecycle.events.OnCreate;
-import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnDestroy;
-import com.android.settings.core.lifecycle.events.OnOptionsItemSelected;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnPrepareOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnResume;
-import com.android.settings.core.lifecycle.events.OnSaveInstanceState;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
-import com.android.settings.core.lifecycle.events.SetPreferenceScreen;
-import com.android.settings.utils.ThreadUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Dispatcher for lifecycle events.
- */
-public class Lifecycle {
-
-    protected final List<LifecycleObserver> mObservers = new ArrayList<>();
-
-    /**
-     * Registers a new observer of lifecycle events.
-     */
-    @UiThread
-    public <T extends LifecycleObserver> T addObserver(T observer) {
-        ThreadUtils.ensureMainThread();
-        mObservers.add(observer);
-        return observer;
-    }
-
-    public void onAttach(Context context) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnAttach) {
-                ((OnAttach) observer).onAttach(context);
-            }
-        }
-    }
-
-    public void onCreate(Bundle savedInstanceState) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnCreate) {
-                ((OnCreate) observer).onCreate(savedInstanceState);
-            }
-        }
-    }
-
-    public void onStart() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnStart) {
-                ((OnStart) observer).onStart();
-            }
-        }
-    }
-
-    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof SetPreferenceScreen) {
-                ((SetPreferenceScreen) observer).setPreferenceScreen(preferenceScreen);
-            }
-        }
-    }
-
-    public void onResume() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnResume) {
-                ((OnResume) observer).onResume();
-            }
-        }
-    }
-
-    public void onPause() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnPause) {
-                ((OnPause) observer).onPause();
-            }
-        }
-    }
-
-    public void onSaveInstanceState(Bundle outState) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnSaveInstanceState) {
-                ((OnSaveInstanceState) observer).onSaveInstanceState(outState);
-            }
-        }
-    }
-
-    public void onStop() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnStop) {
-                ((OnStop) observer).onStop();
-            }
-        }
-    }
-
-    public void onDestroy() {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnDestroy) {
-                ((OnDestroy) observer).onDestroy();
-            }
-        }
-    }
-
-    public void onCreateOptionsMenu(final Menu menu, final @Nullable MenuInflater inflater) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnCreateOptionsMenu) {
-                ((OnCreateOptionsMenu) observer).onCreateOptionsMenu(menu, inflater);
-            }
-        }
-    }
-
-    public void onPrepareOptionsMenu(final Menu menu) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnPrepareOptionsMenu) {
-                ((OnPrepareOptionsMenu) observer).onPrepareOptionsMenu(menu);
-            }
-        }
-    }
-
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        for (LifecycleObserver observer : mObservers) {
-            if (observer instanceof OnOptionsItemSelected) {
-                if (((OnOptionsItemSelected) observer).onOptionsItemSelected(menuItem)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/com/android/settings/core/lifecycle/LifecycleObserver.java b/src/com/android/settings/core/lifecycle/LifecycleObserver.java
deleted file mode 100644
index 1f88e85..0000000
--- a/src/com/android/settings/core/lifecycle/LifecycleObserver.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle;
-
-/**
- * Observer of lifecycle events.
- */
-public interface LifecycleObserver {
-}
diff --git a/src/com/android/settings/core/lifecycle/ObservableActivity.java b/src/com/android/settings/core/lifecycle/ObservableActivity.java
deleted file mode 100644
index 006c9ae..0000000
--- a/src/com/android/settings/core/lifecycle/ObservableActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle;
-
-import android.annotation.Nullable;
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.view.Menu;
-import android.view.MenuItem;
-
-/**
- * {@link Activity} that has hooks to observe activity lifecycle events.
- */
-public class ObservableActivity extends Activity {
-
-    private final Lifecycle mLifecycle = new Lifecycle();
-
-    protected Lifecycle getLifecycle() {
-        return mLifecycle;
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        mLifecycle.onAttach(this);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState,
-            @Nullable PersistableBundle persistentState) {
-        mLifecycle.onAttach(this);
-        super.onCreate(savedInstanceState, persistentState);
-    }
-
-    @Override
-    protected void onStart() {
-        mLifecycle.onStart();
-        super.onStart();
-    }
-
-    @Override
-    protected void onResume() {
-        mLifecycle.onResume();
-        super.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        mLifecycle.onPause();
-        super.onPause();
-    }
-
-    @Override
-    protected void onStop() {
-        mLifecycle.onStop();
-        super.onStop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        mLifecycle.onDestroy();
-        super.onDestroy();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(final Menu menu) {
-        if (super.onCreateOptionsMenu(menu)) {
-            mLifecycle.onCreateOptionsMenu(menu, null);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(final Menu menu) {
-        if (super.onPrepareOptionsMenu(menu)) {
-            mLifecycle.onPrepareOptionsMenu(menu);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem);
-        if (!lifecycleHandled) {
-            return super.onOptionsItemSelected(menuItem);
-        }
-        return lifecycleHandled;
-    }
-}
diff --git a/src/com/android/settings/core/lifecycle/ObservableDialogFragment.java b/src/com/android/settings/core/lifecycle/ObservableDialogFragment.java
deleted file mode 100644
index c3265dd..0000000
--- a/src/com/android/settings/core/lifecycle/ObservableDialogFragment.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle;
-
-import android.app.DialogFragment;
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-/**
- * {@link DialogFragment} that has hooks to observe fragment lifecycle events.
- */
-public class ObservableDialogFragment extends DialogFragment {
-
-    protected final Lifecycle mLifecycle = new Lifecycle();
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mLifecycle.onAttach(context);
-    }
-
-    @Override
-    public void onStart() {
-        mLifecycle.onStart();
-        super.onStart();
-    }
-
-    @Override
-    public void onResume() {
-        mLifecycle.onResume();
-        super.onResume();
-    }
-
-    @Override
-    public void onPause() {
-        mLifecycle.onPause();
-        super.onPause();
-    }
-
-    @Override
-    public void onStop() {
-        mLifecycle.onStop();
-        super.onStop();
-    }
-
-    @Override
-    public void onDestroy() {
-        mLifecycle.onDestroy();
-        super.onDestroy();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
-        mLifecycle.onCreateOptionsMenu(menu, inflater);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(final Menu menu) {
-        mLifecycle.onPrepareOptionsMenu(menu);
-        super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem);
-        if (!lifecycleHandled) {
-            return super.onOptionsItemSelected(menuItem);
-        }
-        return lifecycleHandled;
-    }
-}
diff --git a/src/com/android/settings/core/lifecycle/ObservableFragment.java b/src/com/android/settings/core/lifecycle/ObservableFragment.java
deleted file mode 100644
index 8dae7ea..0000000
--- a/src/com/android/settings/core/lifecycle/ObservableFragment.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core.lifecycle;
-
-import android.annotation.CallSuper;
-import android.app.Fragment;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-public class ObservableFragment extends Fragment {
-
-    private final Lifecycle mLifecycle = new Lifecycle();
-
-    protected Lifecycle getLifecycle() {
-        return mLifecycle;
-    }
-
-    @CallSuper
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mLifecycle.onAttach(context);
-    }
-
-    @CallSuper
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        mLifecycle.onCreate(savedInstanceState);
-        super.onCreate(savedInstanceState);
-    }
-
-    @CallSuper
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        mLifecycle.onSaveInstanceState(outState);
-    }
-
-    @CallSuper
-    @Override
-    public void onStart() {
-        mLifecycle.onStart();
-        super.onStart();
-    }
-
-    @CallSuper
-    @Override
-    public void onStop() {
-        mLifecycle.onStop();
-        super.onStop();
-    }
-
-    @CallSuper
-    @Override
-    public void onResume() {
-        mLifecycle.onResume();
-        super.onResume();
-    }
-
-    @CallSuper
-    @Override
-    public void onPause() {
-        mLifecycle.onPause();
-        super.onPause();
-    }
-
-    @CallSuper
-    @Override
-    public void onDestroy() {
-        mLifecycle.onDestroy();
-        super.onDestroy();
-    }
-
-    @CallSuper
-    @Override
-    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
-        mLifecycle.onCreateOptionsMenu(menu, inflater);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @CallSuper
-    @Override
-    public void onPrepareOptionsMenu(final Menu menu) {
-        mLifecycle.onPrepareOptionsMenu(menu);
-        super.onPrepareOptionsMenu(menu);
-    }
-
-    @CallSuper
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem);
-        if (!lifecycleHandled) {
-            return super.onOptionsItemSelected(menuItem);
-        }
-        return lifecycleHandled;
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java b/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
deleted file mode 100644
index 94a0be1..0000000
--- a/src/com/android/settings/core/lifecycle/ObservablePreferenceFragment.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle;
-
-
-import android.annotation.CallSuper;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceScreen;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-/**
- * {@link PreferenceFragment} that has hooks to observe fragment lifecycle events.
- */
-public abstract class ObservablePreferenceFragment extends PreferenceFragment {
-
-    private final Lifecycle mLifecycle = new Lifecycle();
-
-    protected Lifecycle getLifecycle() {
-        return mLifecycle;
-    }
-
-    @CallSuper
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mLifecycle.onAttach(context);
-    }
-
-    @CallSuper
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        mLifecycle.onCreate(savedInstanceState);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
-        mLifecycle.setPreferenceScreen(preferenceScreen);
-        super.setPreferenceScreen(preferenceScreen);
-    }
-
-    @CallSuper
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        mLifecycle.onSaveInstanceState(outState);
-    }
-
-    @CallSuper
-    @Override
-    public void onStart() {
-        mLifecycle.onStart();
-        super.onStart();
-    }
-
-    @CallSuper
-    @Override
-    public void onStop() {
-        mLifecycle.onStop();
-        super.onStop();
-    }
-
-    @CallSuper
-    @Override
-    public void onResume() {
-        mLifecycle.onResume();
-        super.onResume();
-    }
-
-    @CallSuper
-    @Override
-    public void onPause() {
-        mLifecycle.onPause();
-        super.onPause();
-    }
-
-    @CallSuper
-    @Override
-    public void onDestroy() {
-        mLifecycle.onDestroy();
-        super.onDestroy();
-    }
-
-    @CallSuper
-    @Override
-    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
-        mLifecycle.onCreateOptionsMenu(menu, inflater);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @CallSuper
-    @Override
-    public void onPrepareOptionsMenu(final Menu menu) {
-        mLifecycle.onPrepareOptionsMenu(menu);
-        super.onPrepareOptionsMenu(menu);
-    }
-
-    @CallSuper
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem menuItem) {
-        boolean lifecycleHandled = mLifecycle.onOptionsItemSelected(menuItem);
-        if (!lifecycleHandled) {
-            return super.onOptionsItemSelected(menuItem);
-        }
-        return lifecycleHandled;
-    }
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnAttach.java b/src/com/android/settings/core/lifecycle/events/OnAttach.java
deleted file mode 100644
index 74fbe2f..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnAttach.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle.events;
-
-import android.content.Context;
-
-public interface OnAttach {
-    void onAttach(Context context);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnCreate.java b/src/com/android/settings/core/lifecycle/events/OnCreate.java
deleted file mode 100644
index 9c97cf5..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnCreate.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle.events;
-
-
-import android.os.Bundle;
-
-public interface OnCreate {
-    void onCreate(Bundle savedInstanceState);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java b/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java
deleted file mode 100644
index 4c794ba..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core.lifecycle.events;
-
-import android.view.Menu;
-import android.view.MenuInflater;
-
-public interface OnCreateOptionsMenu {
-    void onCreateOptionsMenu(Menu menu, MenuInflater inflater);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnDestroy.java b/src/com/android/settings/core/lifecycle/events/OnDestroy.java
deleted file mode 100644
index 5499de8..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnDestroy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle.events;
-
-public interface OnDestroy {
-    void onDestroy();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnPause.java b/src/com/android/settings/core/lifecycle/events/OnPause.java
deleted file mode 100644
index 155af00..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnPause.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle.events;
-
-public interface OnPause {
-    void onPause();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java b/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java
deleted file mode 100644
index d642807..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core.lifecycle.events;
-
-import android.view.Menu;
-import android.view.MenuInflater;
-
-public interface OnPrepareOptionsMenu {
-    void onPrepareOptionsMenu(Menu menu);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnResume.java b/src/com/android/settings/core/lifecycle/events/OnResume.java
deleted file mode 100644
index 30ce42b..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnResume.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle.events;
-
-public interface OnResume {
-    void onResume();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java b/src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java
deleted file mode 100644
index fab4041..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnSaveInstanceState.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle.events;
-
-import android.os.Bundle;
-
-
-public interface OnSaveInstanceState {
-    void onSaveInstanceState(Bundle outState);
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnStart.java b/src/com/android/settings/core/lifecycle/events/OnStart.java
deleted file mode 100644
index 3b4e6cc..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnStart.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle.events;
-
-public interface OnStart {
-
-    void onStart();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/OnStop.java b/src/com/android/settings/core/lifecycle/events/OnStop.java
deleted file mode 100644
index 8c19b87..0000000
--- a/src/com/android/settings/core/lifecycle/events/OnStop.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle.events;
-
-public interface OnStop {
-
-    void onStop();
-}
diff --git a/src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java b/src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java
deleted file mode 100644
index d206ed3..0000000
--- a/src/com/android/settings/core/lifecycle/events/SetPreferenceScreen.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.core.lifecycle.events;
-
-import android.support.v7.preference.PreferenceScreen;
-
-public interface SetPreferenceScreen {
-
-    void setPreferenceScreen(PreferenceScreen preferenceScreen);
-}
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index e3e95be..70fd659 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -17,12 +17,15 @@
 
 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.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 @@
     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 @@
 
         @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 @@
         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 @@
                 .setConditions(conditions)
                 .setSuggestions(suggestions)
                 .setCategories(categories)
-                .setSuggestionMode(suggestionMode)
+                .setSuggestionConditionMode(suggestionConditionMode)
                 .build();
     }
 
@@ -138,39 +150,44 @@
 
     public void setCategoriesAndSuggestions(List<DashboardCategory> categories,
             List<Tile> suggestions) {
-        // TODO: Better place for tinting?
-        final TypedArray a = mContext.obtainStyledAttributes(new int[]{
-                android.R.attr.colorControlNormal});
-        int tintColor = a.getColor(0, mContext.getColor(android.R.color.white));
-        a.recycle();
-        for (int i = 0; i < categories.size(); i++) {
-            for (int j = 0; j < categories.get(i).tiles.size(); j++) {
-                final Tile tile = categories.get(i).tiles.get(j);
+        if (mDashboardFeatureProvider.shouldTintIcon()) {
+            // TODO: Better place for tinting?
+            final TypedArray a = mContext.obtainStyledAttributes(new int[]{
+                    android.R.attr.colorControlNormal});
+            final int tintColor = a.getColor(0, mContext.getColor(R.color.fallback_tintColor));
+            a.recycle();
+            for (int i = 0; i < categories.size(); i++) {
+                for (int j = 0; j < categories.get(i).tiles.size(); j++) {
+                    final Tile tile = categories.get(i).tiles.get(j);
 
-                if (!mContext.getPackageName().equals(
-                        tile.intent.getComponent().getPackageName())) {
-                    // If this drawable is coming from outside Settings, tint it to match the
-                    // color.
-                    tile.icon.setTint(tintColor);
+                    if (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 @@
         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 @@
 
     @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 @@
                 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 @@
         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 @@
         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 @@
         }
     }
 
-    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);
-        } else {
-            summaryContentDescription = mContext.getString(R.string.condition_expand_hide);
-        }
-        holder.summary.setContentDescription(summaryContentDescription);
-
-        if (undisplayedSuggestionCount == 0) {
-            holder.summary.setText(null);
-        } else {
-            holder.summary.setText(
-                    mContext.getString(R.string.suggestions_summary, undisplayedSuggestionCount));
-        }
-        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);
-                    }
-                }
+    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 {
-                suggestionMode = DashboardData.SUGGESTION_MODE_COLLAPSED;
+                holder.title.setText(null);
+                updateConditionIcons(data.conditionIcons, holder.icons);
+                holder.icons.setVisibility(View.VISIBLE);
             }
+        } else {
+            holder.icon.setVisibility(View.INVISIBLE);
+            holder.icons.setVisibility(View.INVISIBLE);
+        }
 
+        if (data.hiddenSuggestionCount > 0) {
+            holder.summary.setTextColor(Color.BLACK);
+            if (curMode == DashboardData.HEADER_MODE_COLLAPSED) {
+                if (data.conditionCount > 0) {
+                    holder.summary.setText(mContext.getResources().getQuantityString(
+                        R.plurals.suggestions_collapsed_summary,
+                        data.hiddenSuggestionCount, data.hiddenSuggestionCount));
+                } else {
+                    holder.title.setText(mContext.getResources().getQuantityString(
+                        R.plurals.suggestions_collapsed_title,
+                        data.hiddenSuggestionCount, data.hiddenSuggestionCount));
+                    holder.title.setTextColor(Color.BLACK);
+                    holder.summary.setText(null);
+                }
+            } else if (curMode == DashboardData.HEADER_MODE_DEFAULT) {
+                if (data.conditionCount > 0) {
+                    holder.summary.setText(mContext.getString(
+                        R.string.suggestions_summary, data.hiddenSuggestionCount));
+                } else {
+                    holder.title.setText(mContext.getString(
+                        R.string.suggestions_more_title, data.hiddenSuggestionCount));
+                    holder.title.setTextColor(Color.BLACK);
+                    holder.summary.setText(null);
+                }
+            }
+        } else if (data.conditionCount > 1) {
+            holder.summary.setTextColor(Utils.getColorAccent(mContext));
+            holder.summary.setText(
+                mContext.getString(R.string.condition_summary, data.conditionCount));
+        } else {
+            holder.summary.setText(null);
+        }
+
+        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 -> {
+            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);
+            }
         });
     }
 
-    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);
+    @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 {
-            holder.summary.setVisibility(View.GONE);
+            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) {
+        if (tile.remoteViews != null) {
+            final ViewGroup itemView = (ViewGroup) holder.itemView;
+            itemView.removeAllViews();
+            itemView.addView(tile.remoteViews.apply(itemView.getContext(), itemView));
+        } else {
+            holder.icon.setImageDrawable(mCache.getIcon(tile.icon));
+            holder.title.setText(tile.title);
+            if (!TextUtils.isEmpty(tile.summary)) {
+                holder.summary.setText(tile.summary);
+                holder.summary.setVisibility(View.VISIBLE);
+            } else {
+                holder.summary.setVisibility(View.GONE);
+            }
         }
     }
 
@@ -428,11 +504,28 @@
         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 @@
             summary = itemView.findViewById(android.R.id.summary);
         }
     }
+
+    public static class SuggestionAndConditionHeaderHolder extends DashboardItemHolder {
+        public final LinearLayout icons;
+        public final ImageView expandIndicator;
+
+        public SuggestionAndConditionHeaderHolder(View itemView) {
+            super(itemView);
+            icons = itemView.findViewById(id.additional_icons);
+            expandIndicator = itemView.findViewById(id.expand_indicator);
+        }
+    }
+
+    public static class SuggestionAndConditionContainerHolder extends DashboardItemHolder {
+        public final RecyclerView data;
+
+        public SuggestionAndConditionContainerHolder(View itemView) {
+            super(itemView);
+            data = itemView.findViewById(id.data);
+        }
+    }
+
 }
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index 4e8c7a0..8b04dfc 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.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 @@
  * 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 @@
         return mSuggestions;
     }
 
-    public int getSuggestionMode() {
-        return mSuggestionMode;
-    }
-
-    public Condition getExpandedCondition() {
-        return mExpandedCondition;
+    public int getSuggestionConditionMode() {
+        return mSuggestionConditionMode;
     }
 
     /**
@@ -165,10 +164,10 @@
     /**
      * 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 @@
      * @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 @@
      */
     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;
+
+        final List<Tile> suggestions = getSuggestionsToShow(mSuggestions);
+        final int hiddenSuggestion =
+                hasSuggestions ? sizeOf(mSuggestions) - sizeOf(suggestions) : 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);
+            /* 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);
 
-        resetCount();
-        if (mSuggestions != null) {
-            int maxSuggestions = getDisplayableSuggestionCount();
-            for (int i = 0; i < mSuggestions.size(); i++) {
-                countSuggestion(mSuggestions.get(i), i < maxSuggestions);
-            }
-        }
+            /* 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 @@
         }
     }
 
-    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();
+    }
 
-        return data;
+    private List<Condition> getConditionsToShow(List<Condition> conditions) {
+        if (conditions == null) {
+            return null;
+        }
+        List<Condition> result = new ArrayList<Condition>();
+        final int size = conditions == null ? 0 : conditions.size();
+        for (int i = 0; i < size; i++) {
+            final Condition condition = conditions.get(i);
+            if (condition.shouldShow()) {
+                result.add(condition);
+            }
+        }
+        return result;
+    }
+
+    private List<Tile> getSuggestionsToShow(List<Tile> suggestions) {
+        if (suggestions == null || mSuggestionConditionMode == HEADER_MODE_COLLAPSED) {
+            return null;
+        }
+        if (mSuggestionConditionMode != HEADER_MODE_DEFAULT
+                || suggestions.size() <= DEFAULT_SUGGESTION_COUNT) {
+            return suggestions;
+        }
+        return suggestions.subList(0, DEFAULT_SUGGESTION_COUNT);
     }
 
     /**
      * Builder used to build the ItemsData
      * <p>
-     * {@link #mExpandedCondition} and {@link #mSuggestionMode} have default value
-     * while others are not.
+     * {@link #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 @@
             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 @@
             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 @@
             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 @@
         // 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 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 @@
                     // 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 @@
     }
 
     /**
-     * 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 static class SuggestionConditionHeaderData {
+        public final List<Icon> conditionIcons;
+        public final CharSequence title;
+        public final int conditionCount;
+        public final int hiddenSuggestionCount;
 
-        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;
+        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());
             }
-
-            if (!(obj instanceof SuggestionHeaderData)) {
-                return false;
-            }
-
-            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 9bcf39d..6466c0b 100644
--- a/src/com/android/settings/dashboard/DashboardDecorator.java
+++ b/src/com/android/settings/dashboard/DashboardDecorator.java
@@ -43,19 +43,14 @@
         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 1c55bbb..15608a2 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -56,6 +56,11 @@
     List<DashboardCategory> getAllCategories();
 
     /**
+     * Whether or not we should tint icons in setting pages.
+     */
+    boolean shouldTintIcon();
+
+    /**
      * Returns an unique string key for the tile.
      */
     String getDashboardKeyForTile(Tile tile);
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 342888e..88cf666 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -98,6 +98,11 @@
     }
 
     @Override
+    public boolean shouldTintIcon() {
+        return mContext.getResources().getBoolean(R.bool.config_tintSettingIcon);
+    }
+
+    @Override
     public String getDashboardKeyForTile(Tile tile) {
         if (tile == null || tile.intent == null) {
             return null;
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index dddfb1b..f852544 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.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 @@
                 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 67eae1e..4a53a7c 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -32,31 +32,34 @@
 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 @@
     private DashboardFeatureProvider mDashboardFeatureProvider;
     private SuggestionFeatureProvider mSuggestionFeatureProvider;
     private boolean isOnCategoriesChangedCalled;
-    private SuggestionDismissController mSuggestionDismissHandler;
 
     @Override
     public int getMetricsCategory() {
@@ -94,7 +96,7 @@
         mConditionManager = ConditionManager.get(activity, false);
         getLifecycle().addObserver(mConditionManager);
         mSuggestionParser = new SuggestionParser(activity,
-                activity.getSharedPreferences(SUGGESTIONS, 0), R.xml.suggestion_ordering);
+                mSuggestionFeatureProvider.getSharedPrefs(activity), R.xml.suggestion_ordering);
         mSuggestionsChecks = new SuggestionsChecks(getContext());
         if (DEBUG_TIMING) {
             Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
@@ -191,14 +193,14 @@
         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 @@
         }
     }
 
+    @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 @@
             for (int i = 0; i < suggestions.size(); i++) {
                 Tile suggestion = suggestions.get(i);
                 if (mSuggestionsChecks.isSuggestionComplete(suggestion)) {
-                    mSuggestionFeatureProvider.dismissSuggestion(
-                            context, mSuggestionParser, suggestion);
                     suggestions.remove(i--);
                 }
             }
+            if (sl.isExclusiveSuggestionCategory()) {
+                mSuggestionFeatureProvider.filterExclusiveSuggestions(suggestions);
+            }
             return suggestions;
         }
 
diff --git a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
index 0cc3d15..92055be 100644
--- a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
+++ b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
@@ -30,10 +30,10 @@
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnCreate;
-import com.android.settings.core.lifecycle.events.OnSaveInstanceState;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
new file mode 100644
index 0000000..c2176d7
--- /dev/null
+++ b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dashboard;
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.RestrictionsManager;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.ShowAdminSupportDetailsDialog;
+import com.android.settingslib.RestrictedLockUtils;
+
+/**
+ * Base class for settings screens that should be pin protected when in restricted mode or
+ * that will display an admin support message in case an admin has disabled the options.
+ * The constructor for this class will take the restriction key that this screen should be
+ * locked by.  If {@link RestrictionsManager.hasRestrictionsProvider()} and
+ * {@link UserManager.hasUserRestriction()}, then the user will have to enter the restrictions
+ * pin before seeing the Settings screen.
+ *
+ * {@link RestrictionsManager.hasRestrictionsProvider()} returns true, pass in
+ * {@link RESTRICT_IF_OVERRIDABLE} to the constructor instead of a restrictions key.
+ *
+ * This fragment is a replacement of {@link RestrictedSettingsFragment} but extends
+ * from {@link DashboardFragment}, so we could also use
+ * {@link com.android.settings.core.PreferenceController} in this fragment.
+ */
+public abstract class RestrictedDashboardFragment extends DashboardFragment {
+
+    protected static final String RESTRICT_IF_OVERRIDABLE = "restrict_if_overridable";
+
+    // No RestrictedSettingsFragment screens should use this number in startActivityForResult.
+    private static final int REQUEST_PIN_CHALLENGE = 12309;
+
+    private static final String KEY_CHALLENGE_SUCCEEDED = "chsc";
+    private static final String KEY_CHALLENGE_REQUESTED = "chrq";
+
+    // If the restriction PIN is entered correctly.
+    private boolean mChallengeSucceeded;
+    private boolean mChallengeRequested;
+
+    private UserManager mUserManager;
+    private RestrictionsManager mRestrictionsManager;
+
+    private final String mRestrictionKey;
+    private View mAdminSupportDetails;
+    private EnforcedAdmin mEnforcedAdmin;
+    private TextView mEmptyTextView;
+
+    private boolean mOnlyAvailableForAdmins = false;
+    private boolean mIsAdminUser;
+
+    // Receiver to clear pin status when the screen is turned off.
+    private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (!mChallengeRequested) {
+                mChallengeSucceeded = false;
+                mChallengeRequested = false;
+            }
+        }
+    };
+
+    /**
+     * @param restrictionKey The restriction key to check before pin protecting
+     *            this settings page. Pass in {@link RESTRICT_IF_OVERRIDABLE} if it should
+     *            be protected whenever a restrictions provider is set. Pass in
+     *            null if it should never be protected.
+     */
+    public RestrictedDashboardFragment(String restrictionKey) {
+        mRestrictionKey = restrictionKey;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mRestrictionsManager = (RestrictionsManager) getSystemService(Context.RESTRICTIONS_SERVICE);
+        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        mIsAdminUser = mUserManager.isAdminUser();
+
+        if (icicle != null) {
+            mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false);
+            mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false);
+        }
+
+        IntentFilter offFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
+        offFilter.addAction(Intent.ACTION_USER_PRESENT);
+        getActivity().registerReceiver(mScreenOffReceiver, offFilter);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mAdminSupportDetails = initAdminSupportDetailsView();
+        mEmptyTextView = initEmptyTextView();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        if (getActivity().isChangingConfigurations()) {
+            outState.putBoolean(KEY_CHALLENGE_REQUESTED, mChallengeRequested);
+            outState.putBoolean(KEY_CHALLENGE_SUCCEEDED, mChallengeSucceeded);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (shouldBeProviderProtected(mRestrictionKey)) {
+            ensurePin();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        getActivity().unregisterReceiver(mScreenOffReceiver);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_PIN_CHALLENGE) {
+            if (resultCode == Activity.RESULT_OK) {
+                mChallengeSucceeded = true;
+                mChallengeRequested = false;
+            } else {
+                mChallengeSucceeded = false;
+            }
+            return;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    private void ensurePin() {
+        if (!mChallengeSucceeded && !mChallengeRequested
+                && mRestrictionsManager.hasRestrictionsProvider()) {
+            Intent intent = mRestrictionsManager.createLocalApprovalIntent();
+            if (intent != null) {
+                mChallengeRequested = true;
+                mChallengeSucceeded = false;
+                PersistableBundle request = new PersistableBundle();
+                request.putString(RestrictionsManager.REQUEST_KEY_MESSAGE,
+                        getResources().getString(R.string.restr_pin_enter_admin_pin));
+                intent.putExtra(RestrictionsManager.EXTRA_REQUEST_BUNDLE, request);
+                startActivityForResult(intent, REQUEST_PIN_CHALLENGE);
+            }
+        }
+    }
+
+    /**
+     * Returns true if this activity is restricted, but no restrictions provider has been set.
+     * Used to determine if the settings UI should disable UI.
+     */
+    protected boolean isRestrictedAndNotProviderProtected() {
+        if (mRestrictionKey == null || RESTRICT_IF_OVERRIDABLE.equals(mRestrictionKey)) {
+            return false;
+        }
+        return mUserManager.hasUserRestriction(mRestrictionKey)
+                && !mRestrictionsManager.hasRestrictionsProvider();
+    }
+
+    protected boolean hasChallengeSucceeded() {
+        return (mChallengeRequested && mChallengeSucceeded) || !mChallengeRequested;
+    }
+
+    /**
+     * Returns true if this restrictions key is locked down.
+     */
+    protected boolean shouldBeProviderProtected(String restrictionKey) {
+        if (restrictionKey == null) {
+            return false;
+        }
+        boolean restricted = RESTRICT_IF_OVERRIDABLE.equals(restrictionKey)
+                || mUserManager.hasUserRestriction(mRestrictionKey);
+        return restricted && mRestrictionsManager.hasRestrictionsProvider();
+    }
+
+    private View initAdminSupportDetailsView() {
+        return getActivity().findViewById(R.id.admin_support_details);
+    }
+
+    protected TextView initEmptyTextView() {
+        TextView emptyView = (TextView) getActivity().findViewById(android.R.id.empty);
+        return emptyView;
+    }
+
+    public EnforcedAdmin getRestrictionEnforcedAdmin() {
+        mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
+                mRestrictionKey, UserHandle.myUserId());
+        if (mEnforcedAdmin != null && mEnforcedAdmin.userId == UserHandle.USER_NULL) {
+            mEnforcedAdmin.userId = UserHandle.myUserId();
+        }
+        return mEnforcedAdmin;
+    }
+
+    public TextView getEmptyTextView() {
+        return mEmptyTextView;
+    }
+
+    @Override
+    protected void onDataSetChanged() {
+        highlightPreferenceIfNeeded();
+        if (mAdminSupportDetails != null && isUiRestrictedByOnlyAdmin()) {
+            final EnforcedAdmin admin = getRestrictionEnforcedAdmin();
+            ShowAdminSupportDetailsDialog.setAdminSupportDetails(getActivity(),
+                    mAdminSupportDetails, admin, false);
+            setEmptyView(mAdminSupportDetails);
+        } else if (mEmptyTextView != null) {
+            setEmptyView(mEmptyTextView);
+        }
+        super.onDataSetChanged();
+    }
+
+    public void setIfOnlyAvailableForAdmins(boolean onlyForAdmins) {
+        mOnlyAvailableForAdmins = onlyForAdmins;
+    }
+
+    /**
+     * Returns whether restricted or actionable UI elements should be removed or disabled.
+     */
+    protected boolean isUiRestricted() {
+        return isRestrictedAndNotProviderProtected() || !hasChallengeSucceeded()
+                || (!mIsAdminUser && mOnlyAvailableForAdmins);
+    }
+
+    protected boolean isUiRestrictedByOnlyAdmin() {
+        return isUiRestricted() && !mUserManager.hasBaseUserRestriction(mRestrictionKey,
+                UserHandle.of(UserHandle.myUserId())) && (mIsAdminUser || !mOnlyAvailableForAdmins);
+    }
+}
diff --git a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
index 6842422..64d263f 100644
--- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
+++ b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
@@ -44,7 +44,7 @@
             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 0000000..eb768e5
--- /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 aebbf93..0000000
--- 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 f65908f..a60019a 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionManager.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionManager.java
@@ -21,9 +21,9 @@
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlSerializer;
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
new file mode 100644
index 0000000..4539680
--- /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 708aadb..100c955 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -22,8 +22,8 @@
 
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionParser;
 
 public class SuggestionDismissController extends ItemTouchHelper.SimpleCallback {
 
@@ -65,7 +65,9 @@
 
     @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 14f5e9c..5dc8892 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -16,10 +16,13 @@
 
 package com.android.settings.dashboard.suggestions;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.support.annotation.NonNull;
 
-import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionParser;
 
 import java.util.List;
 
@@ -31,11 +34,13 @@
      */
     boolean isSmartSuggestionEnabled(Context context);
 
-    /** Return true if className is the name of a class of one of your newly added suggestion. */
-    boolean isPresent(String className);
-
     /** Return true if the suggestion has already been completed and does not need to be shown */
-    boolean isSuggestionCompleted(Context context);
+    boolean isSuggestionCompleted(Context context, @NonNull ComponentName suggestion);
+
+    /**
+     * Returns the {@link SharedPreferences} that holds metadata for suggestions.
+     */
+    SharedPreferences getSharedPrefs(Context context);
 
     /**
      * Ranks the list of suggestions in place.
@@ -46,6 +51,11 @@
     void rankSuggestions(final List<Tile> suggestions, List<String> suggestionIds);
 
     /**
+     * Only keep top few suggestions from exclusive suggestions.
+     */
+    void filterExclusiveSuggestions(List<Tile> suggestions);
+
+    /**
      * Dismisses a suggestion.
      */
     void dismissSuggestion(Context context, SuggestionParser parser, Tile suggestion);
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 779a8aa..2171c2a 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 @@
     }
 
     @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(
@@ -62,6 +102,17 @@
     }
 
     @Override
+    public void filterExclusiveSuggestions(List<Tile> suggestions) {
+        if (suggestions == null) {
+            return;
+        }
+        for (int i = suggestions.size() - 1; i >= EXCLUSIVE_SUGGESTION_MAX_COUNT; i--) {
+            Log.d(TAG, "Removing exclusive suggestion");
+            suggestions.remove(i);
+        }
+    }
+
+    @Override
     public void dismissSuggestion(Context context, SuggestionParser parser, Tile suggestion) {
         if (parser == null || suggestion == null || context == null) {
             return;
@@ -78,12 +129,12 @@
                 suggestion.intent.getComponent(),
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                 PackageManager.DONT_KILL_APP);
-        parser.markCategoryDone(suggestion.category);
     }
 
     @Override
     public String getSuggestionIdentifier(Context context, Tile suggestion) {
-        if (suggestion.intent == null || suggestion.intent.getComponent() == null) {
+        if (suggestion.intent == null || suggestion.intent.getComponent() == null
+                || context == null) {
             return "unknown_suggestion";
         }
         String packageName = suggestion.intent.getComponent().getPackageName();
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java b/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java
index a7458bc..14c4b15 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java
@@ -34,13 +34,13 @@
     // 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 bdd5c60..4bed89b 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 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 @@
                 && 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 a341525..d9643f2 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -14,8 +14,6 @@
 
 package com.android.settings.datausage;
 
-import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-
 import android.app.Activity;
 import android.app.LoaderManager;
 import android.content.Context;
@@ -23,7 +21,6 @@
 import android.content.Loader;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.net.INetworkStatsSession;
 import android.net.NetworkPolicy;
@@ -33,28 +30,30 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.UserHandle;
-import android.os.UserManager;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.text.format.Formatter;
 import android.util.ArraySet;
 import android.util.IconDrawableFactory;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.AppInfoBase;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.applications.PackageManagerWrapperImpl;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.AppItem;
-import com.android.settingslib.Utils;
 import com.android.settingslib.net.ChartData;
 import com.android.settingslib.net.ChartDataLoader;
 import com.android.settingslib.net.UidDetail;
 import com.android.settingslib.net.UidDetailProvider;
 
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+
 public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
         DataSaverBackend.Listener {
 
@@ -75,6 +74,7 @@
     private static final int LOADER_CHART_DATA = 2;
     private static final int LOADER_APP_PREF = 3;
 
+    private PackageManagerWrapper mPackageManagerWrapper;
     private final ArraySet<String> mPackages = new ArraySet<>();
     private Preference mTotalUsage;
     private Preference mForegroundUsage;
@@ -103,6 +103,7 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        mPackageManagerWrapper = new PackageManagerWrapperImpl(getPackageManager());
         final Bundle args = getArguments();
 
         try {
@@ -146,11 +147,11 @@
 
         if (mAppItem.key > 0) {
             if (mPackages.size() != 0) {
-                PackageManager pm = getPackageManager();
                 try {
-                    ApplicationInfo info = pm.getApplicationInfo(mPackages.valueAt(0), 0);
+                    ApplicationInfo info = mPackageManagerWrapper.getApplicationInfoAsUser(
+                            mPackages.valueAt(0), 0, UserHandle.getUserId(mAppItem.key));
                     mIcon = IconDrawableFactory.newInstance(getActivity()).getBadgedIcon(info);
-                    mLabel = info.loadLabel(pm);
+                    mLabel = info.loadLabel(mPackageManagerWrapper.getPackageManager());
                     mPackageName = info.packageName;
                 } catch (PackageManager.NameNotFoundException e) {
                 }
@@ -321,22 +322,30 @@
 
         String pkg = mPackages.size() != 0 ? mPackages.valueAt(0) : null;
         int uid = 0;
-        try {
-            uid = pkg != null ? getPackageManager().getPackageUid(pkg, 0) : 0;
-        } catch (PackageManager.NameNotFoundException e) {
+        if (pkg != null) {
+            try {
+                uid = mPackageManagerWrapper.getPackageUidAsUser(pkg,
+                        UserHandle.getUserId(mAppItem.key));
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.w(TAG, "Skipping UID because cannot find package " + pkg);
+            }
         }
 
+        final boolean showInfoButton = mAppItem.key > 0;
+
         final Activity activity = getActivity();
-        final Preference pref = FeatureFactory.getFactory(activity)
-            .getApplicationFeatureProvider(activity)
-            .newAppHeaderController(this, null /* appHeader */)
-            .setIcon(mIcon)
-            .setLabel(mLabel)
-            .setPackageName(pkg)
-            .setUid(uid)
-            .setButtonActions(AppHeaderController.ActionType.ACTION_APP_INFO,
-                AppHeaderController.ActionType.ACTION_NONE)
-            .done(activity, getPrefContext());
+        final Preference pref = EntityHeaderController
+                .newInstance(activity, this, null /* header */)
+                .setRecyclerView(getListView(), getLifecycle())
+                .setUid(uid)
+                .setButtonActions(showInfoButton
+                                ? EntityHeaderController.ActionType.ACTION_APP_INFO
+                                : EntityHeaderController.ActionType.ACTION_NONE,
+                        EntityHeaderController.ActionType.ACTION_NONE)
+                .setIcon(mIcon)
+                .setLabel(mLabel)
+                .setPackageName(pkg)
+                .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }
 
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 115939c..61ca09f 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -101,7 +101,7 @@
 
     private void updatePrefs() {
         NetworkPolicy policy = services.mPolicyEditor.getPolicy(mNetworkTemplate);
-        mBillingCycle.setSummary(getString(R.string.billing_cycle_summary, policy != null ?
+        mBillingCycle.setSummary(getString(R.string.billing_cycle_fragment_summary, policy != null ?
                 policy.cycleDay : 1));
         if (policy != null && policy.warningBytes != WARNING_DISABLED) {
             mDataWarning.setSummary(Formatter.formatFileSize(getContext(), policy.warningBytes));
diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java
index 77460ef..d24c092 100644
--- a/src/com/android/settings/datausage/CellDataPreference.java
+++ b/src/com/android/settings/datausage/CellDataPreference.java
@@ -36,10 +36,10 @@
 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 f72d465..3c3a231 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -15,7 +15,6 @@
 package com.android.settings.datausage;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.net.NetworkPolicy;
 import android.net.NetworkStatsHistory;
 import android.net.TrafficStats;
@@ -29,7 +28,7 @@
 import android.util.SparseIntArray;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settingslib.graph.UsageView;
+import com.android.settings.graph.UsageView;
 
 public class ChartDataUsagePreference extends Preference {
 
@@ -63,7 +62,7 @@
 
         int top = getTop();
         chart.clearPaths();
-        chart.configureGraph(toInt(mEnd - mStart), top, false, false);
+        chart.configureGraph(toInt(mEnd - mStart), top);
         calcPoints(chart);
         chart.setBottomLabels(new CharSequence[] {
                 Utils.formatDateRange(getContext(), mStart, mStart),
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index 7c291c6..f37a3c3 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -18,6 +18,7 @@
 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 @@
     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 @@
 
         @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 @@
 
         @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 ce2bc8d..c2a18e9 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -226,7 +226,7 @@
 
             @Override
             public List<String> getNonIndexableKeys(Context context) {
-                final ArrayList<String> result = new ArrayList<String>();
+                final List<String> result = super.getNonIndexableKeys(context);
                 if (!SHOW_MOBILE_CATEGORY || !hasReadyMobileRadio(context)) {
                     result.add("mobile");
                 }
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 5a84d13..417d74b 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -72,11 +72,21 @@
     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 @@
                 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 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 f3729ae..f93ee0c 100644
--- a/src/com/android/settings/datetime/TimeChangeListenerMixin.java
+++ b/src/com/android/settings/datetime/TimeChangeListenerMixin.java
@@ -21,9 +21,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class TimeChangeListenerMixin extends BroadcastReceiver
         implements LifecycleObserver, OnPause, OnResume {
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index a2fe07d..f7b62b1 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -33,6 +33,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.widget.SwitchBar;
 
 /**
@@ -74,9 +75,11 @@
         mDaysToRetain.setOnPreferenceChangeListener(this);
 
         ContentResolver cr = getContentResolver();
-        int photosDaysToRetain = Settings.Secure.getInt(cr,
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
-                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_DEFAULT);
+        int photosDaysToRetain =
+                Settings.Secure.getInt(
+                        cr,
+                        Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
+                        Utils.getDefaultStorageManagerDaysToRetain(getResources()));
         String[] stringValues =
                 getResources().getStringArray(R.array.automatic_storage_management_days_values);
         mDaysToRetain.setValue(stringValues[daysValueToIndex(photosDaysToRetain, stringValues)]);
@@ -164,4 +167,5 @@
         }
         return indices.length - 1;
     }
+
 }
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 74a6091..7d21a8e 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -58,7 +58,7 @@
 import android.os.storage.IStorageManager;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
-import android.service.persistentdata.PersistentDataBlockManager;
+import android.service.oemlock.OemLockManager;
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.ListPreference;
@@ -82,13 +82,13 @@
 
 import com.android.internal.app.LocalePicker;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.webview.WebViewAppPreferenceController;
@@ -193,7 +193,8 @@
     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";
 
@@ -237,7 +238,6 @@
     private static final int RESULT_DEBUG_APP = 1000;
     private static final int RESULT_MOCK_LOCATION_APP = 1001;
 
-    private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
     private static final String FLASH_LOCKED_PROP = "ro.boot.flash.locked";
 
     private static final String SHORTCUT_MANAGER_RESET_KEY = "reset_shortcut_manager_throttling";
@@ -251,7 +251,7 @@
     private IWebViewUpdateService mWebViewUpdateService;
     private UserManager mUm;
     private WifiManager mWifiManager;
-    private PersistentDataBlockManager mOemUnlockManager;
+    private OemLockManager mOemLockManager;
     private TelephonyManager mTelephonyManager;
 
     private SwitchBar mSwitchBar;
@@ -280,6 +280,7 @@
     private SwitchPreference mWifiVerboseLogging;
     private SwitchPreference mWifiAggressiveHandover;
     private SwitchPreference mMobileDataAlwaysOn;
+    private SwitchPreference mTetheringHardwareOffload;
     private SwitchPreference mBluetoothDisableAbsVolume;
     private SwitchPreference mBluetoothEnableInbandRinging;
 
@@ -336,12 +337,11 @@
 
     private SwitchPreference mColorTemperaturePreference;
 
-    private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
+    private final ArrayList<Preference> mAllPrefs = new ArrayList<>();
 
-    private final ArrayList<SwitchPreference> mResetSwitchPrefs
-            = new ArrayList<SwitchPreference>();
+    private final ArrayList<SwitchPreference> mResetSwitchPrefs = new ArrayList<>();
 
-    private final HashSet<Preference> mDisabledPrefs = new HashSet<Preference>();
+    private final HashSet<Preference> mDisabledPrefs = new HashSet<>();
     // To track whether a confirmation dialog was clicked.
     private boolean mDialogClicked;
     private Dialog mEnableDialog;
@@ -383,8 +383,7 @@
         mBackupManager = IBackupManager.Stub.asInterface(
                 ServiceManager.getService(Context.BACKUP_SERVICE));
         mWebViewUpdateService = WebViewFactory.getUpdateService();
-        mOemUnlockManager = (PersistentDataBlockManager) getActivity()
-                .getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+        mOemLockManager = (OemLockManager) getSystemService(Context.OEM_LOCK_SERVICE);
         mTelephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -402,7 +401,7 @@
             // Block access to developer options if the user is not the owner, if user policy
             // restricts it, or if the device has not been provisioned
             mUnavailable = true;
-            addPreferencesFromResource(R.xml.empty_settings);
+            addPreferencesFromResource(R.xml.placeholder_prefs);
             return;
         }
 
@@ -432,7 +431,7 @@
         mKeepScreenOn = (RestrictedSwitchPreference) findAndInitSwitchPref(KEEP_SCREEN_ON);
         mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG);
         mEnableOemUnlock = (RestrictedSwitchPreference) findAndInitSwitchPref(ENABLE_OEM_UNLOCK);
-        if (!showEnableOemUnlockPreference()) {
+        if (!showEnableOemUnlockPreference(getActivity())) {
             removePreference(mEnableOemUnlock);
             mEnableOemUnlock = null;
         }
@@ -478,6 +477,7 @@
         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);
@@ -558,7 +558,8 @@
 
         mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
         mColorModePreference.updateCurrentAndSupported();
-        if (mColorModePreference.getColorModeCount() < 2) {
+        if (mColorModePreference.getColorModeCount() < 2 ||
+                getContext().getDisplay().isWideColorGamut()) {
             removePreference(KEY_COLOR_MODE);
             mColorModePreference = null;
         }
@@ -809,6 +810,7 @@
         updateWifiAggressiveHandoverOptions();
         updateWifiAllowScansWithTrafficOptions();
         updateMobileDataAlwaysOnOptions();
+        updateTetheringHardwareOffloadOptions();
         updateSimulateColorSpace();
         updateUSBAudioOptions();
         updateForceResizableOptions();
@@ -1014,18 +1016,17 @@
                 mOtaDisableAutomaticUpdate.isChecked() ? 0 : 1);
     }
 
-    private static boolean showEnableOemUnlockPreference() {
-        return !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("");
+    private static boolean showEnableOemUnlockPreference(Context context) {
+        return context.getSystemService(Context.OEM_LOCK_SERVICE) != null;
     }
 
     private boolean enableOemUnlockPreference() {
-        return !isBootloaderUnlocked() && OemUnlockUtils.isOemUnlockAllowed(mUm);
+        return !isBootloaderUnlocked() && mOemLockManager.canUserAllowOemUnlock();
     }
 
     private void updateOemUnlockOptions() {
         if (mEnableOemUnlock != null) {
-            updateSwitchPreference(mEnableOemUnlock,
-                    OemUnlockUtils.isOemUnlockEnabled(getActivity()));
+            updateSwitchPreference(mEnableOemUnlock, mOemLockManager.isOemUnlockAllowed());
             updateOemUnlockSettingDescription();
             // Showing mEnableOemUnlock preference as device has persistent data block.
             mEnableOemUnlock.setDisabledByAdmin(null);
@@ -1461,7 +1462,7 @@
     private void updateBluetoothEnableInbandRingingOptions() {
         if (mBluetoothEnableInbandRinging != null) {
             updateSwitchPreference(mBluetoothEnableInbandRinging,
-                SystemProperties.getBoolean(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, false));
+                SystemProperties.getBoolean(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, true));
         }
     }
 
@@ -1484,6 +1485,18 @@
                 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)) {
@@ -2296,7 +2309,7 @@
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
-                    OemUnlockUtils.setOemUnlockEnabled(getActivity(), true);
+                    mOemLockManager.setOemUnlockAllowedByUser(true);
                 }
             }
         };
@@ -2367,7 +2380,7 @@
                 if (mEnableOemUnlock.isChecked()) {
                     confirmEnableOemUnlock();
                 } else {
-                    OemUnlockUtils.setOemUnlockEnabled(getActivity(), false);
+                    mOemLockManager.setOemUnlockAllowedByUser(false);
                 }
             }
         } else {
@@ -2440,7 +2453,7 @@
                     confirmEnableOemUnlock();
                 }
             } else {
-                OemUnlockUtils.setOemUnlockEnabled(getActivity(), false);
+                mOemLockManager.setOemUnlockAllowedByUser(false);
             }
         } else if (preference == mMockLocationAppPref) {
             Intent intent = new Intent(getActivity(), AppPicker.class);
@@ -2501,6 +2514,8 @@
             writeWifiAllowScansWithTrafficOptions();
         } else if (preference == mMobileDataAlwaysOn) {
             writeMobileDataAlwaysOnOptions();
+        } else if (preference == mTetheringHardwareOffload) {
+            writeTetheringHardwareOffloadOptions();
         } else if (preference == mColorTemperaturePreference) {
             writeColorTemperature();
         } else if (preference == mUSBAudio) {
@@ -2751,7 +2766,8 @@
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
 
-                private boolean isShowingDeveloperOptions(Context context) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
                     return context.getSharedPreferences(DevelopmentSettings.PREF_FILE,
                             Context.MODE_PRIVATE).getBoolean(
                             DevelopmentSettings.PREF_SHOW,
@@ -2762,10 +2778,6 @@
                 public List<SearchIndexableResource> getXmlResourcesToIndex(
                         Context context, boolean enabled) {
 
-                    if (!isShowingDeveloperOptions(context)) {
-                        return null;
-                    }
-
                     final SearchIndexableResource sir = new SearchIndexableResource(context);
                     sir.xmlResId = R.xml.development_prefs;
                     return Arrays.asList(sir);
@@ -2773,12 +2785,9 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    if (!isShowingDeveloperOptions(context)) {
-                        return null;
-                    }
+                    final List<String> keys = super.getNonIndexableKeys(context);
 
-                    final List<String> keys = new ArrayList<String>();
-                    if (!showEnableOemUnlockPreference()) {
+                    if (!showEnableOemUnlockPreference(context)) {
                         keys.add(ENABLE_OEM_UNLOCK);
                     }
                     return keys;
@@ -2806,11 +2815,10 @@
                 oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_bootloader_unlocked;
             } else if (isSimLockedDevice()) {
                 oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_sim_locked_device;
-            } else if (!OemUnlockUtils.isOemUnlockAllowed(mUm)) {
-                // If the device isn't SIM-locked but OEM unlock is disabled by the system via the
-                // user restriction, this means either some other carrier restriction is in place or
-                // the device hasn't been able to confirm which restrictions (SIM-lock or otherwise)
-                // apply.
+            } else if (!mOemLockManager.canUserAllowOemUnlock()) {
+                // If the device isn't SIM-locked but OEM unlock is disallowed by some party, this
+                // means either some other carrier restriction is in place or the device hasn't been
+                // able to confirm which restrictions (SIM-lock or otherwise) apply.
                 oemUnlockSummary =
                         R.string.oem_unlock_enable_disabled_summary_connectivity_or_locked;
             }
@@ -2833,12 +2841,7 @@
      * Returns {@code true} if the bootloader has been unlocked. Otherwise, returns {code false}.
      */
     private boolean isBootloaderUnlocked() {
-        int flashLockState = PersistentDataBlockManager.FLASH_LOCK_UNKNOWN;
-        if (mOemUnlockManager != null) {
-            flashLockState = mOemUnlockManager.getFlashLockState();
-        }
-
-        return flashLockState == PersistentDataBlockManager.FLASH_LOCK_UNLOCKED;
+        return mOemLockManager.isDeviceOemUnlocked();
     }
 
 
diff --git a/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java b/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
index 31f7a20..9ea24da 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
@@ -18,11 +18,15 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.Toast;
+
+import com.android.settings.R;
 
 public class DevelopmentSettingsDisabledActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Toast.makeText(this, R.string.dev_settings_disabled_warning, Toast.LENGTH_SHORT).show();
         finish();
     }
 }
diff --git a/src/com/android/settings/development/DevelopmentSettingsEnabler.java b/src/com/android/settings/development/DevelopmentSettingsEnabler.java
index e97997e..7132631 100644
--- a/src/com/android/settings/development/DevelopmentSettingsEnabler.java
+++ b/src/com/android/settings/development/DevelopmentSettingsEnabler.java
@@ -20,9 +20,9 @@
 import android.content.SharedPreferences;
 import android.provider.Settings;
 
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class DevelopmentSettingsEnabler implements LifecycleObserver, OnResume {
 
diff --git a/src/com/android/settings/development/OemUnlockUtils.java b/src/com/android/settings/development/OemUnlockUtils.java
deleted file mode 100644
index cee3679..0000000
--- a/src/com/android/settings/development/OemUnlockUtils.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.service.persistentdata.PersistentDataBlockManager;
-import android.util.Log;
-
-public class OemUnlockUtils {
-    private static final String TAG = "OemUnlockUtils";
-
-    /**
-     * Returns whether or not this device is able to be OEM unlocked.
-     */
-    static boolean isOemUnlockEnabled(Context context) {
-        PersistentDataBlockManager manager = (PersistentDataBlockManager)
-                context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
-        return manager.getOemUnlockEnabled();
-    }
-
-    /**
-     * Allows enabling or disabling OEM unlock on this device. OEM unlocked
-     * devices allow users to flash other OSes to them.
-     */
-    static void setOemUnlockEnabled(Context context, boolean enabled) {
-        try {
-            PersistentDataBlockManager manager = (PersistentDataBlockManager)
-                    context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
-            manager.setOemUnlockEnabled(enabled);
-        } catch (SecurityException e) {
-            Log.e(TAG, "Fail to set oem unlock.", e);
-        }
-    }
-
-    /**
-     * Returns {@code true} if OEM unlock is disallowed by user restriction
-     * {@link UserManager#DISALLOW_FACTORY_RESET} or {@link UserManager#DISALLOW_OEM_UNLOCK}.
-     * Otherwise, returns {@code false}.
-     */
-    static boolean isOemUnlockAllowed(UserManager um) {
-        final UserHandle userHandle = UserHandle.of(UserHandle.myUserId());
-        return !(um.hasBaseUserRestriction(UserManager.DISALLOW_OEM_UNLOCK, userHandle)
-                || um.hasBaseUserRestriction(UserManager.DISALLOW_FACTORY_RESET, userHandle));
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index bee1351..9232838 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -30,18 +30,18 @@
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.development.DevelopmentSettingsEnabler;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class BuildNumberPreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
index e8792f2..1b56301 100644
--- a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
@@ -27,10 +27,10 @@
 import android.util.Log;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 
 public class FirmwareVersionPreferenceController extends PreferenceController
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
index 4724c3d..88b9487 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
@@ -25,11 +25,11 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnOptionsItemSelected;
-import com.android.settings.core.lifecycle.events.OnPrepareOptionsMenu;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
+import com.android.settingslib.core.lifecycle.events.OnOptionsItemSelected;
+import com.android.settingslib.core.lifecycle.events.OnPrepareOptionsMenu;
 
 import java.util.Objects;
 
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 10df004..04da586 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -473,6 +473,9 @@
                         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/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 710e5dd..c3d3547 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.deviceinfo;
 
+import static android.content.Context.CARRIER_CONFIG_SERVICE;
+import static android.content.Context.TELEPHONY_SERVICE;
+
+import android.Manifest;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -58,9 +62,6 @@
 
 import java.util.List;
 
-import static android.content.Context.CARRIER_CONFIG_SERVICE;
-import static android.content.Context.TELEPHONY_SERVICE;
-
 
 /**
  * Display the following information
@@ -69,7 +70,7 @@
  * # Roaming
  * # Device Id (IMEI in GSM and MEID in CDMA)
  * # Network type
- * # Operator info (area info cell broadcast for Brazil)
+ * # Operator info (area update info cell broadcast)
  * # Signal Strength
  *
  */
@@ -87,18 +88,14 @@
     private static final String KEY_IMEI = "imei";
     private static final String KEY_IMEI_SV = "imei_sv";
     private static final String KEY_ICCID = "iccid";
-    private static final String COUNTRY_ABBREVIATION_BRAZIL = "br";
 
-    static final String CB_AREA_INFO_RECEIVED_ACTION =
-            "android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
+    static private final String CB_AREA_INFO_RECEIVED_ACTION =
+            "com.android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
 
-    static final String GET_LATEST_CB_AREA_INFO_ACTION =
-            "android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO";
+    static private final String GET_LATEST_CB_AREA_INFO_ACTION =
+            "com.android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO";
 
-    // Require the sender to have this permission to prevent third-party spoofing.
-    static final String CB_AREA_INFO_SENDER_PERMISSION =
-            "android.permission.RECEIVE_EMERGENCY_BROADCAST";
-
+    static private final String CELL_BROADCAST_RECEIVER_APP = "com.android.cellbroadcastreceiver";
 
     private TelephonyManager mTelephonyManager;
     private CarrierConfigManager mCarrierConfigManager;
@@ -118,7 +115,9 @@
     private List<SubscriptionInfo> mSelectableSubInfos;
 
     private PhoneStateListener mPhoneStateListener;
-    private BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
+
+    // Once the cell broadcast configuration is moved into telephony framework,
+    private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
@@ -128,8 +127,7 @@
                     return;
                 }
                 CellBroadcastMessage cbMessage = (CellBroadcastMessage) extras.get("message");
-                if (cbMessage != null && cbMessage.getServiceCategory() == 50
-                        && mSir.getSubscriptionId() == cbMessage.getSubId()) {
+                if (cbMessage != null && mSir.getSubscriptionId() == cbMessage.getSubId()) {
                     String latestAreaInfo = cbMessage.getMessageBody();
                     updateAreaInfo(latestAreaInfo);
                 }
@@ -216,11 +214,12 @@
             if (mShowLatestAreaInfo) {
                 getContext().registerReceiver(mAreaInfoReceiver,
                         new IntentFilter(CB_AREA_INFO_RECEIVED_ACTION),
-                        CB_AREA_INFO_SENDER_PERMISSION, null);
+                        Manifest.permission.RECEIVE_EMERGENCY_BROADCAST, null);
                 // Ask CellBroadcastReceiver to broadcast the latest area info received
                 Intent getLatestIntent = new Intent(GET_LATEST_CB_AREA_INFO_ACTION);
+                getLatestIntent.setPackage(CELL_BROADCAST_RECEIVER_APP);
                 getContext().sendBroadcastAsUser(getLatestIntent, UserHandle.ALL,
-                        CB_AREA_INFO_SENDER_PERMISSION);
+                        Manifest.permission.RECEIVE_EMERGENCY_BROADCAST);
             }
         }
     }
@@ -381,11 +380,8 @@
 
     private void updatePreference() {
         if (mPhone.getPhoneType() != TelephonyManager.PHONE_TYPE_CDMA) {
-            // only show area info when SIM country is Brazil
-            if (COUNTRY_ABBREVIATION_BRAZIL.equals(mTelephonyManager.getSimCountryIso(
-                            mSir.getSubscriptionId()))) {
-                mShowLatestAreaInfo = true;
-            }
+            mShowLatestAreaInfo = Resources.getSystem().getBoolean(
+                    com.android.internal.R.bool.config_showAreaUpdateInfoSettings);
         }
         PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(
                 mSir.getSubscriptionId());
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 13b3d0b..b5a7b3b 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -113,6 +113,11 @@
         getLoaderManager().initLoader(VOLUME_SIZE_JOB_ID, Bundle.EMPTY, new VolumeSizeCallbacks());
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_storage_dashboard;
+    }
+
     private void onReceivedSizes() {
         if (mStorageInfo == null || mAppsResult == null) {
             return;
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index 6ae6c1a..3dcf935 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -30,9 +30,11 @@
 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 @@
     }
 
     protected void updateProgressBar() {
-        if (mProgressBar == null)
+        if (mProgressBar == null || mProgressPercent == UNINITIALIZED)
             return;
 
-        if (mProgressPercent == -1) {
-            mProgressBar.setVisibility(View.GONE);
-            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 ce9ea9b..0107555 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -549,77 +549,87 @@
         }
     };
 
-    /**
-     * Enable indexing of searchable data
-     */
+    /** Enable indexing of searchable data */
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-        new BaseSearchIndexProvider() {
-            @Override
-            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(
+                        Context context, boolean enabled) {
+                    final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
 
-                SearchIndexableRaw data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.storage_settings);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
+                    SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.storage_settings);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
 
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.internal_storage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.internal_storage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
 
-                data = new SearchIndexableRaw(context);
-                final StorageManager storage = context.getSystemService(StorageManager.class);
-                final List<VolumeInfo> vols = storage.getVolumes();
-                for (VolumeInfo vol : vols) {
-                    if (isInteresting(vol)) {
-                        data.title = storage.getBestVolumeDescription(vol);
-                        data.screenTitle = context.getString(R.string.storage_settings);
-                        result.add(data);
+                    data = new SearchIndexableRaw(context);
+                    final StorageManager storage = context.getSystemService(StorageManager.class);
+                    final List<VolumeInfo> vols = storage.getVolumes();
+                    for (VolumeInfo vol : vols) {
+                        if (isInteresting(vol)) {
+                            data.title = storage.getBestVolumeDescription(vol);
+                            data.screenTitle = context.getString(R.string.storage_settings);
+                            result.add(data);
+                        }
                     }
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_size);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_available);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_apps_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_dcim_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_music_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_downloads_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_media_cache_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.memory_media_misc_usage);
+                    data.screenTitle = context.getString(R.string.storage_settings);
+                    result.add(data);
+
+                    data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.storage_menu_free);
+                    data.screenTitle = context.getString(R.string.storage_menu_free);
+                    // We need to define all three in order for this to trigger properly.
+                    data.intentAction = StorageManager.ACTION_MANAGE_STORAGE;
+                    data.intentTargetPackage =
+                            context.getString(R.string.config_deletion_helper_package);
+                    data.intentTargetClass =
+                            context.getString(R.string.config_deletion_helper_class);
+                    result.add(data);
+
+                    return result;
                 }
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_size);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_available);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_apps_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_dcim_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_music_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_downloads_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_media_cache_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                data = new SearchIndexableRaw(context);
-                data.title = context.getString(R.string.memory_media_misc_usage);
-                data.screenTitle = context.getString(R.string.storage_settings);
-                result.add(data);
-
-                return result;
-            }
-        };
+            };
 }
diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java
index eb4edd8..5d2502b 100644
--- a/src/com/android/settings/deviceinfo/UsbBackend.java
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -28,11 +28,11 @@
 
 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 @@
     }
 
     @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 a8ca5b9..3e81fc7 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -26,12 +26,12 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.widget.MasterSwitchController;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.SwitchWidgetController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class AutomaticStorageManagementSwitchPreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume, SwitchWidgetController.OnSwitchChangeListener {
@@ -88,9 +88,17 @@
                 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 44d3d44..d653f7c 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.overlay.FeatureFactory;
 import com.android.settings.widget.DonutView;
 
+import java.text.NumberFormat;
 import java.util.Locale;
 
 /**
@@ -46,7 +47,7 @@
  * 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 @@
             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 0000000..b80f655
--- /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 0000000..ac99d71
--- /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 0000000..f3e3046
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplayPreferenceController.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.display;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.app.NightDisplayController;
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+
+public class AmbientDisplayPreferenceController extends PreferenceController {
+
+    private static final int MY_USER_ID = UserHandle.myUserId();
+
+    private final AmbientDisplayConfiguration mConfig;
+    private final String mKey;
+
+    public AmbientDisplayPreferenceController(Context context, AmbientDisplayConfiguration config,
+            String key) {
+        super(context);
+        mConfig = config;
+        mKey = key;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mConfig.available();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (mConfig.alwaysOnEnabled(MY_USER_ID)) {
+            preference.setSummary(R.string.ambient_display_screen_summary_always_on);
+        } else if (mConfig.pulseOnNotificationEnabled(MY_USER_ID)) {
+            preference.setSummary(R.string.ambient_display_screen_summary_notifications);
+        } else if (mConfig.enabled(MY_USER_ID)) {
+            preference.setSummary(R.string.switch_on_text);
+        } else {
+            preference.setSummary(R.string.switch_off_text);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return mKey;
+    }
+}
diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java
new file mode 100644
index 0000000..666d47a6
--- /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 6f9a302..12f3a8b 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 @@
 
     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 @@
     @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 fd79e51..a39cde5 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -14,26 +14,33 @@
 package com.android.settings.display;
 
 import android.content.Context;
-import android.content.res.Configuration;
-import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.TwoStatePreference;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.view.RotationPolicy;
-import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class AutoRotatePreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
+        Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_AUTO_ROTATE = "auto_rotate";
     private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private TwoStatePreference mPreference;
+    private RotationPolicy.RotationPolicyListener mRotationPolicyListener;
 
-    public AutoRotatePreferenceController(Context context) {
+    public AutoRotatePreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
     }
 
     @Override
@@ -43,29 +50,8 @@
 
     @Override
     public void updateState(Preference preference) {
-        final DropDownPreference rotatePreference = (DropDownPreference) preference;
-        final int rotateLockedResourceId;
-        preference.setSummary("%s");
-        // The following block sets the string used when rotation is locked.
-        // If the device locks specifically to portrait or landscape (rather than current
-        // rotation), then we use a different string to include this information.
-        if (allowAllRotations()) {
-            rotateLockedResourceId = R.string.display_auto_rotate_stay_in_current;
-        } else {
-            if (RotationPolicy.getRotationLockOrientation(mContext)
-                    == Configuration.ORIENTATION_PORTRAIT) {
-                rotateLockedResourceId = R.string.display_auto_rotate_stay_in_portrait;
-            } else {
-                rotateLockedResourceId = R.string.display_auto_rotate_stay_in_landscape;
-            }
-        }
-        rotatePreference.setEntries(new CharSequence[]{
-                mContext.getString(R.string.display_auto_rotate_rotate),
-                mContext.getString(rotateLockedResourceId),
-        });
-        rotatePreference.setEntryValues(new CharSequence[]{"0", "1"});
-        rotatePreference.setValueIndex(RotationPolicy.isRotationLocked(mContext) ?
-                1 : 0);
+        mPreference = (TwoStatePreference) preference;
+        updatePreference();
     }
 
     @Override
@@ -73,17 +59,40 @@
         return RotationPolicy.isRotationLockToggleVisible(mContext);
     }
 
-    private boolean allowAllRotations() {
-        return mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_allowAllRotations);
-    }
-
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean locked = Integer.parseInt((String) newValue) != 0;
+        final boolean locked = !(boolean) newValue;
         mMetricsFeatureProvider.action(mContext, MetricsProto.MetricsEvent.ACTION_ROTATION_LOCK,
                 locked);
         RotationPolicy.setRotationLock(mContext, locked);
         return true;
     }
+
+    @Override
+    public void onResume() {
+        if (mRotationPolicyListener == null) {
+            mRotationPolicyListener = new RotationPolicy.RotationPolicyListener() {
+                @Override
+                public void onChange() {
+                    updatePreference();
+                }
+            };
+        }
+        RotationPolicy.registerRotationPolicyListener(mContext,
+                mRotationPolicyListener);
+    }
+
+    @Override
+    public void onPause() {
+        if (mRotationPolicyListener != null) {
+            RotationPolicy.unregisterRotationPolicyListener(mContext, mRotationPolicyListener);
+        }
+    }
+
+    private void updatePreference() {
+        if (mPreference == null) {
+            return;
+        }
+        mPreference.setChecked(!RotationPolicy.isRotationLocked(mContext));
+    }
 }
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
new file mode 100644
index 0000000..a8ad8c6
--- /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 0000000..9574016
--- /dev/null
+++ b/src/com/android/settings/display/ColorModePreferenceController.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.android.settings.display;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.TwoStatePreference;
+import android.util.Log;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.core.PreferenceController;
+
+public class ColorModePreferenceController extends PreferenceController implements
+        Preference.OnPreferenceChangeListener {
+    private static final String TAG = "ColorModePreference";
+
+    private static final String KEY_COLOR_MODE = "color_mode";
+
+    @VisibleForTesting
+    static final float COLOR_SATURATION_DEFAULT = 1.0f;
+    @VisibleForTesting
+    static final float COLOR_SATURATION_VIVID = 1.1f;
+
+    private static final int SURFACE_FLINGER_TRANSACTION_SATURATION = 1022;
+    @VisibleForTesting
+    static final String PERSISTENT_PROPERTY_SATURATION = "persist.sys.sf.color_saturation";
+
+    private final IBinder mSurfaceFlinger;
+    private final ConfigurationWrapper mConfigWrapper;
+
+    public ColorModePreferenceController(Context context) {
+        super(context);
+        mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
+        mConfigWrapper = new ConfigurationWrapper(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_COLOR_MODE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        TwoStatePreference colorMode = (TwoStatePreference) preference;
+        colorMode.setChecked(getSaturationValue() > 1.0f);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mConfigWrapper.isScreenWideColorGamut();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        float saturation = (boolean) newValue
+                ? COLOR_SATURATION_VIVID : COLOR_SATURATION_DEFAULT;
+
+        SystemProperties.set(PERSISTENT_PROPERTY_SATURATION, Float.toString(saturation));
+        applySaturation(saturation);
+
+        return true;
+    }
+
+    /**
+     * Propagates the provided saturation to the SurfaceFlinger.
+     */
+    private void applySaturation(float saturation) {
+        if (mSurfaceFlinger != null) {
+            final Parcel data = Parcel.obtain();
+            data.writeInterfaceToken("android.ui.ISurfaceComposer");
+            data.writeFloat(saturation);
+            try {
+                mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_SATURATION, data, null, 0);
+            } catch (RemoteException ex) {
+                Log.e(TAG, "Failed to set saturation", ex);
+            } finally {
+                data.recycle();
+            }
+        }
+    }
+
+    private static float getSaturationValue() {
+        try {
+            return Float.parseFloat(SystemProperties.get(
+                    PERSISTENT_PROPERTY_SATURATION, Float.toString(COLOR_SATURATION_DEFAULT)));
+        } catch (NumberFormatException e) {
+            return COLOR_SATURATION_DEFAULT;
+        }
+    }
+
+    @VisibleForTesting
+    static class ConfigurationWrapper {
+        private final Context mContext;
+
+        ConfigurationWrapper(Context context) {
+            mContext = context;
+        }
+
+        boolean isScreenWideColorGamut() {
+            return mContext.getResources().getConfiguration().isScreenWideColorGamut();
+        }
+    }
+}
diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java
index 0c5c187..a62e6b5 100644
--- a/src/com/android/settings/display/DensityPreference.java
+++ b/src/com/android/settings/display/DensityPreference.java
@@ -16,6 +16,7 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.text.BidiFormatter;
 import android.text.InputType;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
@@ -23,10 +24,13 @@
 import android.view.Display;
 import android.view.View;
 import android.widget.EditText;
-import com.android.settings.CustomEditTextPreference;
+
 import com.android.settings.R;
+import com.android.settingslib.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 @@
     @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 ad72053..0000000
--- 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 1da16fe..23ddf07 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -28,7 +28,7 @@
 import com.android.internal.app.NightDisplayController;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.text.DateFormat;
@@ -74,6 +74,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_night_display;
+    }
+
+    @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
 
diff --git a/src/com/android/settings/display/PowerManagerWrapper.java b/src/com/android/settings/display/PowerManagerWrapper.java
new file mode 100644
index 0000000..afa2f33
--- /dev/null
+++ b/src/com/android/settings/display/PowerManagerWrapper.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import android.os.PowerManager;
+
+/**
+ * This class replicates a subset of the android.os.PowerManager. The class exists so that we can
+ * use a thin wrapper around the PowerManager in production code and a mock in tests. We cannot
+ * directly mock or shadow the PowerManager, because some of the methods we rely on are newer than
+ * the API version supported by Robolectric or are hidden.
+ */
+public class PowerManagerWrapper {
+    private final PowerManager mPowerManager;
+
+    public PowerManagerWrapper(PowerManager powerManager) {
+        mPowerManager = powerManager;
+    }
+
+    public int getMinimumScreenBrightnessSetting() {
+        return mPowerManager.getMinimumScreenBrightnessSetting();
+    }
+
+    public int getMaximumScreenBrightnessSetting() {
+        return mPowerManager.getMaximumScreenBrightnessSetting();
+    }
+
+    public int getMinimumScreenBrightnessForVrSetting() {
+        return mPowerManager.getMinimumScreenBrightnessForVrSetting();
+    }
+
+    public int getMaximumScreenBrightnessForVrSetting() {
+        return mPowerManager.getMaximumScreenBrightnessForVrSetting();
+    }
+}
diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java
index fab9062..7a10802 100644
--- a/src/com/android/settings/display/ScreenSaverPreferenceController.java
+++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java
@@ -16,8 +16,8 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.DreamSettings;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.dream.DreamSettings;
 
 public class ScreenSaverPreferenceController extends PreferenceController {
 
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index 7538cd3..ec3999b 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -94,6 +94,11 @@
     }
 
     @Override
+    public int getHelpResource() {
+        return R.string.help_url_display_size;
+    }
+
+    @Override
     public int getMetricsCategory() {
         return MetricsEvent.DISPLAY_SCREEN_ZOOM;
     }
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index 99a19f8..c38ed28 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -90,11 +90,20 @@
         pref.setEntries(labels);
         pref.setEntryValues(pkgs);
         String theme = getCurrentTheme();
-        if (TextUtils.isEmpty(theme)) {
-            theme = mContext.getString(R.string.default_theme);
-            pref.setSummary(theme);
+        CharSequence themeLabel = null;
+
+        for (int i = 0; i < pkgs.length; i++) {
+            if (TextUtils.equals(pkgs[i], theme)) {
+                themeLabel = labels[i];
+                break;
+            }
         }
-        pref.setSummary(theme);
+
+        if (TextUtils.isEmpty(themeLabel)) {
+            themeLabel = mContext.getString(R.string.default_theme);
+        }
+
+        pref.setSummary(themeLabel);
         pref.setValue(theme);
     }
 
@@ -127,7 +136,7 @@
                     UserHandle.myUserId());
             for (int i = 0, size = infos.size(); i < size; i++) {
                 if (infos.get(i).isEnabled() &&
-                         isChangeableOverlay(infos.get(i).packageName)) {
+                        isChangeableOverlay(infos.get(i).packageName)) {
                     return infos.get(i).packageName;
                 }
             }
diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index aa29afc..b2e0f7b 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 0000000..da9bf9e
--- /dev/null
+++ b/src/com/android/settings/dream/CurrentDreamPicker.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public final class CurrentDreamPicker extends RadioButtonPickerFragment {
+
+    private DreamBackend mBackend;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DREAM;
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        Map<String, ComponentName> componentNameMap = getDreamComponentsMap();
+        if (componentNameMap.get(key) != null) {
+            mBackend.setActiveDream(componentNameMap.get(key));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return mBackend.getActiveDream().flattenToString();
+    }
+
+    @Override
+    protected List<? extends CandidateInfo> getCandidates() {
+        final List<DreamCandidateInfo> candidates;
+        candidates = mBackend.getDreamInfos().stream()
+                .map(DreamCandidateInfo::new)
+                .collect(Collectors.toList());
+
+        return candidates;
+    }
+
+    @Override
+    protected void onSelectionPerformed(boolean success) {
+        super.onSelectionPerformed(success);
+
+        getActivity().finish();
+    }
+
+    private Map<String, ComponentName> getDreamComponentsMap() {
+        Map<String, ComponentName> comps = new HashMap<>();
+        mBackend.getDreamInfos()
+                .forEach((info) ->
+                        comps.put(info.componentName.flattenToString(), info.componentName));
+
+        return comps;
+    }
+
+    private static final class DreamCandidateInfo extends CandidateInfo {
+        private final CharSequence name;
+        private final Drawable icon;
+        private final String key;
+
+        DreamCandidateInfo(DreamInfo info) {
+            super(true);
+
+            name = info.caption;
+            icon = info.icon;
+            key = info.componentName.flattenToString();
+        }
+
+        @Override
+        public CharSequence loadLabel() {
+            return name;
+        }
+
+        @Override
+        public Drawable loadIcon() {
+            return icon;
+        }
+
+        @Override
+        public String getKey() {
+            return key;
+        }
+    }
+}
diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
new file mode 100644
index 0000000..5b448f8
--- /dev/null
+++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.widget.GearPreference;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+import java.util.Optional;
+
+public class CurrentDreamPreferenceController extends PreferenceController {
+    private final DreamBackend mBackend;
+    private final static String TAG = "CurrentDreamPreferenceController";
+    private final static String CURRENT_SCREENSAVER = "current_screensaver";
+
+    public CurrentDreamPreferenceController(Context context) {
+        super(context);
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mBackend.getDreamInfos().size() > 0;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return CURRENT_SCREENSAVER;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        preference.setSummary(mBackend.getActiveDreamName());
+        setGearClickListenerForPreference(preference);
+    }
+
+    private void setGearClickListenerForPreference(Preference preference) {
+        if (!(preference instanceof GearPreference)) return;
+
+        GearPreference gearPreference = (GearPreference)preference;
+        Optional<DreamInfo> info = getActiveDreamInfo();
+        if (!info.isPresent() || info.get().settingsComponentName == null) {
+            gearPreference.setOnGearClickListener(null);
+            return;
+        }
+        gearPreference.setOnGearClickListener(gearPref -> launchScreenSaverSettings());
+    }
+
+    private void launchScreenSaverSettings() {
+        Optional<DreamInfo> info = getActiveDreamInfo();
+        if (!info.isPresent()) return;
+        mBackend.launchSettings(info.get());
+    }
+
+    private Optional<DreamInfo> getActiveDreamInfo() {
+        return mBackend.getDreamInfos()
+                .stream()
+                .filter((info) -> info.isActive)
+                .findFirst();
+    }
+}
diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java
new file mode 100644
index 0000000..8c10d45
--- /dev/null
+++ b/src/com/android/settings/dream/DreamSettings.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.WhenToDream;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.android.settingslib.dream.DreamBackend.EITHER;
+import static com.android.settingslib.dream.DreamBackend.NEVER;
+import static com.android.settingslib.dream.DreamBackend.WHILE_CHARGING;
+import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED;
+
+public class DreamSettings extends DashboardFragment {
+
+    private static final String TAG = "DreamSettings";
+    static final String WHILE_CHARGING_ONLY = "while_charging_only";
+    static final String WHILE_DOCKED_ONLY = "while_docked_only";
+    static final String EITHER_CHARGING_OR_DOCKED = "either_charging_or_docked";
+    static final String NEVER_DREAM = "never";
+
+    @WhenToDream
+    static int getSettingFromPrefKey(String key) {
+        switch (key) {
+            case WHILE_CHARGING_ONLY:
+                return WHILE_CHARGING;
+            case WHILE_DOCKED_ONLY:
+                return WHILE_DOCKED;
+            case EITHER_CHARGING_OR_DOCKED:
+                return EITHER;
+            case NEVER_DREAM:
+            default:
+                return NEVER;
+        }
+    }
+
+    static String getKeyFromSetting(@WhenToDream int dreamSetting) {
+        switch (dreamSetting) {
+            case WHILE_CHARGING:
+                return WHILE_CHARGING_ONLY;
+            case WHILE_DOCKED:
+                return WHILE_DOCKED_ONLY;
+            case EITHER:
+                return EITHER_CHARGING_OR_DOCKED;
+            case NEVER:
+            default:
+                return NEVER_DREAM;
+        }
+    }
+
+    static int getDreamSettingDescriptionResId(@WhenToDream int dreamSetting) {
+        switch (dreamSetting) {
+            case WHILE_CHARGING:
+                return R.string.screensaver_settings_summary_sleep;
+            case WHILE_DOCKED:
+                return R.string.screensaver_settings_summary_dock;
+            case EITHER:
+                return R.string.screensaver_settings_summary_either_long;
+            case NEVER:
+            default:
+                return R.string.screensaver_settings_summary_never;
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.DREAM;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.dream_fragment_overview;
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_screen_saver;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    public static CharSequence getSummaryTextWithDreamName(Context context) {
+        DreamBackend backend = DreamBackend.getInstance(context);
+        return getSummaryTextFromBackend(backend, context);
+    }
+
+    @VisibleForTesting
+    static CharSequence getSummaryTextFromBackend(DreamBackend backend, Context context) {
+        if (!backend.isEnabled()) {
+            return context.getString(R.string.screensaver_settings_summary_off);
+        } else {
+            return backend.getActiveDreamName();
+        }
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context) {
+        List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new CurrentDreamPreferenceController(context));
+        controllers.add(new WhenToDreamPreferenceController(context));
+        controllers.add(new StartNowPreferenceController(context));
+        return controllers;
+    }
+
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER
+            = new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.dream_fragment_overview;
+                    return Arrays.asList(sir);
+                }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context);
+                }
+            };
+}
+
diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java
new file mode 100644
index 0000000..994b70b
--- /dev/null
+++ b/src/com/android/settings/dream/StartNowPreferenceController.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.Button;
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.dream.DreamBackend;
+
+public class StartNowPreferenceController extends PreferenceController {
+    private static final String TAG = "StartNowPreferenceController";
+    private static final String PREF_KEY = "dream_start_now_button_container";
+    private final DreamBackend mBackend;
+
+    public StartNowPreferenceController(Context context) {
+        super(context);
+
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        LayoutPreference pref = (LayoutPreference) screen.findPreference(getPreferenceKey());
+        Button startButton = (Button)pref.findViewById(R.id.dream_start_now_button);
+        startButton.setOnClickListener(v -> mBackend.startDreaming());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        Button startButton = (Button)((LayoutPreference)preference)
+                .findViewById(R.id.dream_start_now_button);
+        startButton.setEnabled(mBackend.getWhenToDreamSetting() != DreamBackend.NEVER);
+    }
+}
diff --git a/src/com/android/settings/dream/WhenToDreamPicker.java b/src/com/android/settings/dream/WhenToDreamPicker.java
new file mode 100644
index 0000000..a55064d
--- /dev/null
+++ b/src/com/android/settings/dream/WhenToDreamPicker.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settingslib.dream.DreamBackend;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WhenToDreamPicker extends RadioButtonPickerFragment {
+
+    private static final String TAG = "WhenToDreamPicker";
+    private DreamBackend mBackend;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DREAM;
+    }
+
+    @Override
+    protected List<? extends CandidateInfo> getCandidates() {
+        final String[] entries = entries();
+        final String[] values = keys();
+        final List<WhenToDreamCandidateInfo> candidates = new ArrayList<>();
+
+        if (entries == null || entries.length <= 0) return null;
+        if (values == null || values.length != entries.length) {
+            throw new IllegalArgumentException("Entries and values must be of the same length.");
+        }
+
+        for (int i = 0; i < entries.length; i++) {
+            candidates.add(new WhenToDreamCandidateInfo(entries[i], values[i]));
+        }
+
+        return candidates;
+    }
+
+    private String[] entries() {
+        return getResources().getStringArray(R.array.when_to_start_screensaver_entries);
+    }
+
+    private String[] keys() {
+        return getResources().getStringArray(R.array.when_to_start_screensaver_values);
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return DreamSettings.getKeyFromSetting(mBackend.getWhenToDreamSetting());
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        mBackend.setWhenToDream(DreamSettings.getSettingFromPrefKey(key));
+        return true;
+    }
+
+    @Override
+    protected void onSelectionPerformed(boolean success) {
+        super.onSelectionPerformed(success);
+
+        getActivity().finish();
+    }
+
+    private final class WhenToDreamCandidateInfo extends CandidateInfo {
+        private final String name;
+        private final String key;
+
+        WhenToDreamCandidateInfo(String title, String value) {
+            super(true);
+
+            name = title;
+            key = value;
+        }
+
+        @Override
+        public CharSequence loadLabel() {
+            return name;
+        }
+
+        @Override
+        public Drawable loadIcon() {
+            return null;
+        }
+
+        @Override
+        public String getKey() {
+            return key;
+        }
+    }
+}
diff --git a/src/com/android/settings/dream/WhenToDreamPreferenceController.java b/src/com/android/settings/dream/WhenToDreamPreferenceController.java
new file mode 100644
index 0000000..0d870fd
--- /dev/null
+++ b/src/com/android/settings/dream/WhenToDreamPreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.dream.DreamBackend;
+
+public class WhenToDreamPreferenceController extends PreferenceController {
+
+    private static final String WHEN_TO_START = "when_to_start";
+    private final DreamBackend mBackend;
+
+    WhenToDreamPreferenceController(Context context) {
+        super(context);
+
+        mBackend = DreamBackend.getInstance(context);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        int resId = DreamSettings.getDreamSettingDescriptionResId(mBackend.getWhenToDreamSetting());
+        preference.setSummary(preference.getContext().getString(resId));
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WHEN_TO_START;
+    }
+}
diff --git a/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
index 003ed11..be41e4d 100644
--- a/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
@@ -17,7 +17,7 @@
 import android.Manifest;
 import android.content.Context;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AdminGrantedCameraPermissionPreferenceController extends
         AdminGrantedPermissionsPreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
index 5343483..77c6040 100644
--- a/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
@@ -17,7 +17,7 @@
 import android.Manifest;
 import android.content.Context;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AdminGrantedLocationPermissionsPreferenceController extends
         AdminGrantedPermissionsPreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java b/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
index 64396c5..9896420 100644
--- a/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
@@ -17,7 +17,7 @@
 import android.Manifest;
 import android.content.Context;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AdminGrantedMicrophonePermissionPreferenceController extends
         AdminGrantedPermissionsPreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
index 556baec..9187cec 100644
--- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -21,8 +21,8 @@
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public abstract class AdminGrantedPermissionsPreferenceControllerBase
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
index 32f2bbe..ed91fef 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
@@ -18,8 +18,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AlwaysOnVpnCurrentUserPreferenceController
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
index 8486368..db6fc1d 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
@@ -16,8 +16,8 @@
 import android.content.Context;
 
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AlwaysOnVpnManagedProfilePreferenceController
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceController.java b/src/com/android/settings/enterprise/CaCertsPreferenceController.java
index fc89dc8..65c109c 100644
--- a/src/com/android/settings/enterprise/CaCertsPreferenceController.java
+++ b/src/com/android/settings/enterprise/CaCertsPreferenceController.java
@@ -20,8 +20,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class CaCertsPreferenceController extends DynamicAvailabilityPreferenceController {
 
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
index babf90e..8605b2e 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
@@ -45,6 +45,13 @@
     int getMaximumFailedPasswordsForWipe(@Nullable ComponentName admin, int userHandle);
 
     /**
+     * Calls {@code DevicePolicyManager.getDeviceOwnerComponentOnCallingUser()}.
+     *
+     * @see android.app.admin.DevicePolicyManager#getDeviceOwnerComponentOnCallingUser
+     */
+    ComponentName getDeviceOwnerComponentOnCallingUser();
+
+    /**
      * Calls {@code DevicePolicyManager.getDeviceOwnerComponentOnAnyUser()}.
      *
      * @see android.app.admin.DevicePolicyManager#getDeviceOwnerComponentOnAnyUser
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
index 7906310..e11aaf6 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
@@ -42,6 +42,11 @@
     }
 
     @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 9876f71..cced8e8 100644
--- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
@@ -19,8 +19,8 @@
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class EnterpriseInstalledPackagesPreferenceController
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 46ecb7e..a5e2f3c 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -158,11 +158,14 @@
 
     @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 372982f..6ec091b 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
@@ -18,8 +18,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class EnterprisePrivacyPreferenceController extends DynamicAvailabilityPreferenceController {
 
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index f7327c8..54f0508 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -22,10 +22,10 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
index 35f6e41..537ef78 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
@@ -22,9 +22,9 @@
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.EnterpriseDefaultApps;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.users.UserFeatureProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class EnterpriseSetDefaultAppsPreferenceController
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
index 4c89659..7833325 100644
--- a/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
+++ b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
@@ -20,7 +20,7 @@
 
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
index d3f9a98..d7f8dc0 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
@@ -15,7 +15,7 @@
 
 import android.content.Context;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class FailedPasswordWipeCurrentUserPreferenceController
         extends FailedPasswordWipePreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
index 205d7c1..739003a 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
@@ -14,7 +14,7 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class FailedPasswordWipeManagedProfilePreferenceController
         extends FailedPasswordWipePreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
index 7485fe2..298f911 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -20,8 +20,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public abstract class FailedPasswordWipePreferenceControllerBase
         extends DynamicAvailabilityPreferenceController {
diff --git a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
index 76c49da..55552b6 100644
--- a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
+++ b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
@@ -16,8 +16,8 @@
 import android.content.Context;
 
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class GlobalHttpProxyPreferenceController extends DynamicAvailabilityPreferenceController {
 
diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java
index b13aec7..ca52fc0 100644
--- a/src/com/android/settings/enterprise/ImePreferenceController.java
+++ b/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -20,8 +20,8 @@
 
 import com.android.settings.R;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ImePreferenceController extends DynamicAvailabilityPreferenceController {
 
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
index d581804..7c34f2d 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
@@ -18,6 +18,7 @@
 
 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.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;
 
 /**
@@ -57,6 +59,12 @@
     }
 
     @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);
         outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index f637187..e85a38e 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -37,13 +37,14 @@
 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 @@
         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 @@
         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 5152d31..1902a52 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -20,12 +20,15 @@
 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 @@
     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 @@
     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 @@
         } 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 @@
     @Override
     protected void onStart() {
         super.onStart();
-        mAnimation.startAnimation();
+        if (mAnimation != null) {
+            mAnimation.startAnimation();
+        }
     }
 
     private void startLookingForFingerprint() {
@@ -102,13 +115,17 @@
     @Override
     protected void onStop() {
         super.onStop();
-        mAnimation.pauseAnimation();
+        if (mAnimation != null) {
+            mAnimation.pauseAnimation();
+        }
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mAnimation.stopAnimation();
+        if (mAnimation != null) {
+            mAnimation.stopAnimation();
+        }
     }
 
     @Override
@@ -119,9 +136,15 @@
     }
 
     @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 551564d..dd83121 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -29,10 +29,10 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.password.ChooseLockGeneric;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.setupwizardlib.span.LinkSpan;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
index cbfec0c..9ab561d 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -26,9 +26,10 @@
 import android.os.UserHandle;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
+
 import com.android.settings.password.IFingerprintManager;
 
 import java.util.ArrayList;
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 607d28c..5bde6de 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -46,8 +46,8 @@
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextPaint;
-import android.text.style.URLSpan;
 import android.text.TextUtils;
+import android.text.style.URLSpan;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -56,21 +56,20 @@
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.widget.FooterPreference;
+import com.android.settings.password.ChooseLockGeneric;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.widget.FooterPreference;
 
-import java.util.List;
 import java.util.HashMap;
-
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import java.util.List;
 
 /**
  * Settings screen for fingerprints
@@ -262,14 +261,18 @@
                         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 0000000..e1a4183
--- /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 5d0152c..fbbf033 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;
@@ -32,12 +31,6 @@
     }
 
     @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 aff1028..f62b701 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 {
 
@@ -44,12 +43,6 @@
     }
 
     @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 92ea5cb..e81203f 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 {
 
@@ -41,20 +39,10 @@
     }
 
     @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 3951aff..59907cf 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 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;
     }
@@ -46,12 +73,6 @@
     }
 
     @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,33 +91,55 @@
 
     @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
     public int getMetricsCategory() {
         return MetricsEvent.FINGERPRINT_ENROLL_INTRO_SETUP;
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 42b049a..9a37879 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.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.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 @@
  *
  * 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 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 @@
     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 @@
     @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 @@
             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 @@
         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 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 @@
         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 @@
         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 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.power_usage_detail_ia;
+        return R.xml.power_usage_detail;
     }
 
     @Override
@@ -270,4 +321,24 @@
             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 89f03b3..6b4c8a9 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
@@ -52,16 +52,16 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnDestroy;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnDestroy;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
index 9d37333..f7a2b9a 100644
--- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
@@ -50,11 +50,7 @@
 
     @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 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 aaac024f..2b39877 100644
--- a/src/com/android/settings/fuelgauge/BatteryCellParser.java
+++ b/src/com/android/settings/fuelgauge/BatteryCellParser.java
@@ -19,7 +19,6 @@
 import android.util.SparseIntArray;
 import com.android.settings.Utils;
 import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;
-import com.android.settingslib.BatteryInfo;
 
 public class BatteryCellParser implements BatteryInfo.BatteryDataParser, BatteryActiveProvider {
 
diff --git a/src/com/android/settings/fuelgauge/BatteryFlagParser.java b/src/com/android/settings/fuelgauge/BatteryFlagParser.java
index cd5d89b..d4f3fb2 100644
--- a/src/com/android/settings/fuelgauge/BatteryFlagParser.java
+++ b/src/com/android/settings/fuelgauge/BatteryFlagParser.java
@@ -18,7 +18,6 @@
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
 import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;
-import com.android.settingslib.BatteryInfo;
 
 public class BatteryFlagParser implements BatteryInfo.BatteryDataParser, BatteryActiveProvider {
 
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 04e2c7a..079ab29 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 mSummary;
+    TextView mSummary1;
+    @VisibleForTesting
+    TextView mSummary2;
+
+    private final Activity mActivity;
+    private final PreferenceFragment mHost;
+    private final Lifecycle mLifecycle;
 
     private LayoutPreference mBatteryLayoutPref;
 
-    public BatteryHeaderPreferenceController(Context context) {
+    public BatteryHeaderPreferenceController(Context context, Activity activity,
+            PreferenceFragment host, Lifecycle lifecycle) {
         super(context);
+        mActivity = activity;
+        mHost = host;
+        mLifecycle = lifecycle;
+        if (mLifecycle != null) {
+            mLifecycle.addObserver(this);
+        }
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-
         mBatteryLayoutPref = (LayoutPreference) screen.findPreference(KEY_BATTERY_HEADER);
         mBatteryMeterView = (BatteryMeterView) mBatteryLayoutPref
                 .findViewById(R.id.battery_header_icon);
-        mTimeText = (TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent);
-        mSummary = (TextView) mBatteryLayoutPref.findViewById(R.id.summary1);
+        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 @@
         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 8588f77..e9a2250 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -40,7 +40,6 @@
 import android.view.View;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settingslib.BatteryInfo;
 import libcore.icu.LocaleData;
 
 import java.util.ArrayList;
@@ -507,81 +506,82 @@
 
         mMaxPercentLabelString = Utils.formatPercentage(100);
         mMinPercentLabelString = Utils.formatPercentage(0);
-        mInfo = BatteryInfo.getBatteryInfo(getContext(), mBatteryBroadcast, mStats,
-                elapsedRealtimeUs);
-        mDrainString = "";
-        mChargeDurationString = "";
-        setContentDescription(mInfo.chargeLabelString);
+        BatteryInfo.getBatteryInfo(getContext(), info -> {
+            mInfo = info;
+            mDrainString = "";
+            mChargeDurationString = "";
+            setContentDescription(mInfo.chargeLabel);
 
-        int pos = 0;
-        int lastInteresting = 0;
-        byte lastLevel = -1;
-        mBatLow = 0;
-        mBatHigh = 100;
-        mStartWallTime = 0;
-        mEndDataWallTime = 0;
-        mEndWallTime = 0;
-        mHistStart = 0;
-        mHistEnd = 0;
-        long lastWallTime = 0;
-        long lastRealtime = 0;
-        int aggrStates = 0;
-        int aggrStates2 = 0;
-        boolean first = true;
-        if (stats.startIteratingHistoryLocked()) {
-            final HistoryItem rec = new HistoryItem();
-            while (stats.getNextHistoryLocked(rec)) {
-                pos++;
-                if (first) {
-                    first = false;
-                    mHistStart = rec.time;
-                }
-                if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
-                        || rec.cmd == HistoryItem.CMD_RESET) {
-                    // If there is a ridiculously large jump in time, then we won't be
-                    // able to create a good chart with that data, so just ignore the
-                    // times we got before and pretend like our data extends back from
-                    // the time we have now.
-                    // Also, if we are getting a time change and we are less than 5 minutes
-                    // since the start of the history real time, then also use this new
-                    // time to compute the base time, since whatever time we had before is
-                    // pretty much just noise.
-                    if (rec.currentTime > (lastWallTime+(180*24*60*60*1000L))
-                            || rec.time < (mHistStart+(5*60*1000L))) {
-                        mStartWallTime = 0;
+            int pos = 0;
+            int lastInteresting = 0;
+            byte lastLevel = -1;
+            mBatLow = 0;
+            mBatHigh = 100;
+            mStartWallTime = 0;
+            mEndDataWallTime = 0;
+            mEndWallTime = 0;
+            mHistStart = 0;
+            mHistEnd = 0;
+            long lastWallTime = 0;
+            long lastRealtime = 0;
+            int aggrStates = 0;
+            int aggrStates2 = 0;
+            boolean first = true;
+            if (stats.startIteratingHistoryLocked()) {
+                final HistoryItem rec = new HistoryItem();
+                while (stats.getNextHistoryLocked(rec)) {
+                    pos++;
+                    if (first) {
+                        first = false;
+                        mHistStart = rec.time;
                     }
-                    lastWallTime = rec.currentTime;
-                    lastRealtime = rec.time;
-                    if (mStartWallTime == 0) {
-                        mStartWallTime = lastWallTime - (lastRealtime-mHistStart);
+                    if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
+                            || rec.cmd == HistoryItem.CMD_RESET) {
+                        // If there is a ridiculously large jump in time, then we won't be
+                        // able to create a good chart with that data, so just ignore the
+                        // times we got before and pretend like our data extends back from
+                        // the time we have now.
+                        // Also, if we are getting a time change and we are less than 5 minutes
+                        // since the start of the history real time, then also use this new
+                        // time to compute the base time, since whatever time we had before is
+                        // pretty much just noise.
+                        if (rec.currentTime > (lastWallTime+(180*24*60*60*1000L))
+                                || rec.time < (mHistStart+(5*60*1000L))) {
+                            mStartWallTime = 0;
+                        }
+                        lastWallTime = rec.currentTime;
+                        lastRealtime = rec.time;
+                        if (mStartWallTime == 0) {
+                            mStartWallTime = lastWallTime - (lastRealtime-mHistStart);
+                        }
                     }
-                }
-                if (rec.isDeltaData()) {
-                    if (rec.batteryLevel != lastLevel || pos == 1) {
-                        lastLevel = rec.batteryLevel;
+                    if (rec.isDeltaData()) {
+                        if (rec.batteryLevel != lastLevel || pos == 1) {
+                            lastLevel = rec.batteryLevel;
+                        }
+                        lastInteresting = pos;
+                        mHistDataEnd = rec.time;
+                        aggrStates |= rec.states;
+                        aggrStates2 |= rec.states2;
                     }
-                    lastInteresting = pos;
-                    mHistDataEnd = rec.time;
-                    aggrStates |= rec.states;
-                    aggrStates2 |= rec.states2;
                 }
             }
-        }
-        mHistEnd = mHistDataEnd + (mInfo.remainingTimeUs/1000);
-        mEndDataWallTime = lastWallTime + mHistDataEnd - lastRealtime;
-        mEndWallTime = mEndDataWallTime + (mInfo.remainingTimeUs/1000);
-        mNumHist = lastInteresting;
-        mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
-        mHaveFlashlight = (aggrStates2&HistoryItem.STATE2_FLASHLIGHT_FLAG) != 0;
-        mHaveCamera = (aggrStates2&HistoryItem.STATE2_CAMERA_FLAG) != 0;
-        mHaveWifi = (aggrStates2&HistoryItem.STATE2_WIFI_RUNNING_FLAG) != 0
-                || (aggrStates&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
-                        |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
-                        |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0;
-        if (!com.android.settings.Utils.isWifiOnly(getContext())) {
-            mHavePhoneSignal = true;
-        }
-        if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
+            mHistEnd = mHistDataEnd + (mInfo.remainingTimeUs/1000);
+            mEndDataWallTime = lastWallTime + mHistDataEnd - lastRealtime;
+            mEndWallTime = mEndDataWallTime + (mInfo.remainingTimeUs/1000);
+            mNumHist = lastInteresting;
+            mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
+            mHaveFlashlight = (aggrStates2&HistoryItem.STATE2_FLASHLIGHT_FLAG) != 0;
+            mHaveCamera = (aggrStates2&HistoryItem.STATE2_CAMERA_FLAG) != 0;
+            mHaveWifi = (aggrStates2&HistoryItem.STATE2_WIFI_RUNNING_FLAG) != 0
+                    || (aggrStates&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
+                    |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
+                    |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0;
+            if (!com.android.settings.Utils.isWifiOnly(getContext())) {
+                mHavePhoneSignal = true;
+            }
+            if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
+        }, mStats, false /* shortString */);
     }
 
     @Override
@@ -589,7 +589,8 @@
         mMaxPercentLabelStringWidth = (int)mTextPaint.measureText(mMaxPercentLabelString);
         mMinPercentLabelStringWidth = (int)mTextPaint.measureText(mMinPercentLabelString);
         mDrainStringWidth = (int)mHeaderTextPaint.measureText(mDrainString);
-        mChargeLabelStringWidth = (int)mHeaderTextPaint.measureText(mInfo.chargeLabelString);
+        mChargeLabelStringWidth = (int) mHeaderTextPaint.measureText(
+                mInfo.chargeLabel.toString());
         mChargeDurationStringWidth = (int)mHeaderTextPaint.measureText(mChargeDurationString);
         mTextAscent = (int)mTextPaint.ascent();
         mTextDescent = (int)mTextPaint.descent();
@@ -1211,8 +1212,9 @@
 
         int headerTop = -mHeaderTextAscent + (mHeaderTextDescent-mHeaderTextAscent)/3;
         mHeaderTextPaint.setTextAlign(textAlignLeft);
-        if (DEBUG) Log.d(TAG, "Drawing charge label string: " + mInfo.chargeLabelString);
-        canvas.drawText(mInfo.chargeLabelString, textStartX, headerTop, mHeaderTextPaint);
+        if (DEBUG) Log.d(TAG, "Drawing charge label string: " + mInfo.chargeLabel);
+        canvas.drawText(mInfo.chargeLabel.toString(), textStartX, headerTop,
+                mHeaderTextPaint);
         int stringHalfWidth = mChargeDurationStringWidth / 2;
         if (layoutRtl) stringHalfWidth = -stringHalfWidth;
         int headerCenter = ((width-mChargeDurationStringWidth-mDrainStringWidth)/2)
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
index 7d3e1d1..3661467 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -20,7 +20,6 @@
 import android.os.BatteryStats;
 import android.os.BatteryStats.HistoryItem;
 import android.os.Bundle;
-import android.os.SystemClock;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -31,8 +30,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;
-import com.android.settingslib.BatteryInfo;
-import com.android.settingslib.graph.UsageView;
+import com.android.settings.graph.UsageView;
 
 public class BatteryHistoryDetail extends SettingsPreferenceFragment {
     public static final String EXTRA_STATS = "stats";
@@ -92,24 +90,25 @@
     }
 
     private void updateEverything() {
-        BatteryInfo info = BatteryInfo.getBatteryInfo(getContext(), mBatteryBroadcast, mStats,
-                SystemClock.elapsedRealtime() * 1000);
-        final View view = getView();
-        info.bindHistory((UsageView) view.findViewById(R.id.battery_usage), mChargingParser,
-                mScreenOn, mGpsParser, mFlashlightParser, mCameraParser, mWifiParser, mCpuParser,
-                mPhoneParser);
-        ((TextView) view.findViewById(R.id.charge)).setText(info.batteryPercentString);
-        ((TextView) view.findViewById(R.id.estimation)).setText(info.remainingLabel);
+        BatteryInfo.getBatteryInfo(getContext(), info -> {
+            final View view = getView();
+            info.bindHistory((UsageView) view.findViewById(R.id.battery_usage), mChargingParser,
+                    mScreenOn, mGpsParser, mFlashlightParser, mCameraParser, mWifiParser,
+                    mCpuParser, mPhoneParser);
+            ((TextView) view.findViewById(R.id.charge)).setText(info.batteryPercentString);
+            ((TextView) view.findViewById(R.id.estimation)).setText(info.remainingLabel);
 
-        bindData(mChargingParser, R.string.battery_stats_charging_label, R.id.charging_group);
-        bindData(mScreenOn, R.string.battery_stats_screen_on_label, R.id.screen_on_group);
-        bindData(mGpsParser, R.string.battery_stats_gps_on_label, R.id.gps_group);
-        bindData(mFlashlightParser, R.string.battery_stats_flashlight_on_label,
-                R.id.flashlight_group);
-        bindData(mCameraParser, R.string.battery_stats_camera_on_label, R.id.camera_group);
-        bindData(mWifiParser, R.string.battery_stats_wifi_running_label, R.id.wifi_group);
-        bindData(mCpuParser, R.string.battery_stats_wake_lock_label, R.id.cpu_group);
-        bindData(mPhoneParser, R.string.battery_stats_phone_signal_label, R.id.cell_network_group);
+            bindData(mChargingParser, R.string.battery_stats_charging_label, R.id.charging_group);
+            bindData(mScreenOn, R.string.battery_stats_screen_on_label, R.id.screen_on_group);
+            bindData(mGpsParser, R.string.battery_stats_gps_on_label, R.id.gps_group);
+            bindData(mFlashlightParser, R.string.battery_stats_flashlight_on_label,
+                    R.id.flashlight_group);
+            bindData(mCameraParser, R.string.battery_stats_camera_on_label, R.id.camera_group);
+            bindData(mWifiParser, R.string.battery_stats_wifi_running_label, R.id.wifi_group);
+            bindData(mCpuParser, R.string.battery_stats_wake_lock_label, R.id.cpu_group);
+            bindData(mPhoneParser, R.string.battery_stats_phone_signal_label,
+                    R.id.cell_network_group);
+        }, mStats, false /* shortString */);
     }
 
     private void bindData(BatteryActiveProvider provider, int label, int groupId) {
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index 1f6030e..b944577 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 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 0000000..a0e56c1
--- /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 0000000..ce22a8c
--- /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 09f7c7a..353b3d7 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -78,6 +78,11 @@
 
     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 34c9a26..bb7e678 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 @@
 
         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 @@
         }
     };
 
-    private final class BatteryStateChangeReceiver extends BroadcastReceiver {
-        private boolean mRegistered;
+    @Override
+    public void onPowerSaveModeChanged() {
+        mBatterySaverPref.setChecked(mPowerManager.isPowerSaveMode());
+        updateSummary();
+    }
 
-        @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 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 0000000..2254438
--- /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 6b7ddf9..88dab49 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.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 @@
 
     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 @@
         mTriggerPref.init(this);
 
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        mReceiver = new BatterySaverReceiver(mContext);
+        mReceiver.setBatterySaverListener(this);
     }
 
     @Override
@@ -187,37 +185,14 @@
         }
     };
 
-    private final class Receiver extends BroadcastReceiver {
+    @Override
+    public void onPowerSaveModeChanged() {
+        mHandler.post(mUpdateSwitch);
+    }
 
-        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 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 b99519b..b81f282 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
@@ -31,19 +31,22 @@
 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 @@
 
     }
 
-    @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 9a4db1e..a041543 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 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 @@
  * 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 @@
     private static BatteryUtils sInstance;
 
     private PackageManager mPackageManager;
+    private AppOpsManager mAppOpsManager;
     @VisibleForTesting
     PowerUsageFeatureProvider mPowerUsageFeatureProvider;
 
@@ -71,6 +84,7 @@
     @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 @@
         }
         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 @@
                         && 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 @@
      */
     @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;
             }
@@ -221,8 +239,69 @@
     }
 
     /**
+     * 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 @@
 
     }
 
-    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 0000000..5f4758a
--- /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 b124c81..322c908 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.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 @@
     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 @@
         mInfo = info;
         mContentDescription = contentDescription;
         mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size);
+        mShowAnomalyIcon = false;
     }
 
     public void setContentDescription(String name) {
@@ -88,6 +92,15 @@
         return mProgress;
     }
 
+    public void shouldShowAnomalyIcon(boolean showAnomalyIcon) {
+        mShowAnomalyIcon = showAnomalyIcon;
+        notifyChanged();
+    }
+
+    public boolean showAnomalyIcon() {
+        return mShowAnomalyIcon;
+    }
+
     BatteryEntry getInfo() {
         return mInfo;
     }
@@ -98,7 +111,14 @@
         ImageView icon = (ImageView) view.findViewById(android.R.id.icon);
         icon.setLayoutParams(new LinearLayout.LayoutParams(mIconSize, mIconSize));
 
-        ((TextView) view.findViewById(R.id.widget_summary)).setText(mProgress);
+        final TextView subtitle = (TextView) view.findViewById(R.id.widget_summary);
+        subtitle.setText(mProgress);
+        if (mShowAnomalyIcon) {
+            subtitle.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_warning_24dp, 0,
+                    0, 0);
+        } else {
+            subtitle.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0);
+        }
         if (mContentDescription != null) {
             final TextView titleView = (TextView) view.findViewById(android.R.id.title);
             titleView.setContentDescription(mContentDescription);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index 0940e19..712b9ad 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -15,7 +15,10 @@
 
 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 @@
             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 @@
 
     @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 @@
 
         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 0000000..ef7110e
--- /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 060abdd..88edb7a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -37,6 +37,7 @@
     // +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 @@
         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 @@
     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 7cb6c00..6d7e1e8 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 @@
      * 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 be38855..0814364 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -19,7 +19,11 @@
 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 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 4a4d4de..86c3a32 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.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.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 @@
  * 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 @@
 
     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 @@
     @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 @@
     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 @@
 
     @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 @@
         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 @@
     @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 @@
                         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 @@
                 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 @@
     }
 
     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 @@
             return;
         }
 
-        cacheRemoveAllPrefs(mAppListGroup);
-        mAppListGroup.setOrderingAsAdded(false);
-        boolean addedSome = false;
+        restartAnomalyDetectionIfPossible();
 
-        final PowerProfile powerProfile = mStatsHelper.getPowerProfile();
-        final BatteryStats stats = mStatsHelper.getStats();
-        final double averagePower = powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
-
-        final long elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
-        Intent batteryBroadcast = context.registerReceiver(null,
-                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-        BatteryInfo batteryInfo = BatteryInfo.getBatteryInfo(context, batteryBroadcast,
-                mStatsHelper.getStats(), elapsedRealtimeUs, false);
-        mBatteryHeaderPreferenceController.updateHeaderPreference(batteryInfo);
-
-        final TypedValue value = new TypedValue();
-        context.getTheme().resolveAttribute(android.R.attr.colorControlNormal, value, true);
-        final int colorControl = context.getColor(value.resourceId);
-        final int dischargeAmount = USE_FAKE_DATA ? 5000
-                : stats != null ? stats.getDischargeAmount(mStatsType) : 0;
-
+        // reload BatteryInfo and updateUI
+        restartBatteryInfoLoader();
         final long lastFullChargeTime = mBatteryUtils.calculateLastFullChargeTime(mStatsHelper,
                 System.currentTimeMillis());
         updateScreenPreference();
@@ -440,6 +538,27 @@
                 : R.string.power_usage_list_summary;
         mAppListGroup.setTitle(TextUtils.expandTemplate(getText(resId), timeSequence));
 
+        refreshAppListGroup();
+    }
+
+    private void refreshAppListGroup() {
+        final Context context = getContext();
+        final PowerProfile powerProfile = mStatsHelper.getPowerProfile();
+        final BatteryStats stats = mStatsHelper.getStats();
+        final double averagePower = powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
+        boolean addedSome = false;
+
+        TypedArray array = context.obtainStyledAttributes(
+                new int[]{android.R.attr.colorControlNormal});
+        final int colorControl = array.getColor(0, 0);
+        array.recycle();
+
+        final int dischargeAmount = USE_FAKE_DATA ? 5000
+                : stats != null ? stats.getDischargeAmount(mStatsType) : 0;
+
+        cacheRemoveAllPrefs(mAppListGroup);
+        mAppListGroup.setOrderingAsAdded(false);
+
         if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP || USE_FAKE_DATA) {
             final List<BatterySipper> usageList = getCoalescedUsageList(
                     USE_FAKE_DATA ? getFakeStats() : mStatsHelper.getUsageList());
@@ -458,31 +577,8 @@
                 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 @@
                 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);
@@ -532,6 +629,37 @@
     }
 
     @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++) {
             final BatterySipper sipper = usageList.get(i);
@@ -560,11 +688,14 @@
     }
 
     @VisibleForTesting
-    long calculateRunningTimeBasedOnStatsType() {
-        final long elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
-        // Return the battery time (millisecond) on status mStatsType
-        return mStatsHelper.getStats().computeBatteryRealtime(elapsedRealtimeUs,
-                mStatsType /* STATS_SINCE_CHARGED */) / 1000;
+    void showBothEstimates() {
+        final Context context = getContext();
+        if (context == null
+                || !mPowerFeatureProvider.isEnhancedBatteryPredictionEnabled(context)) {
+            return;
+        }
+        getLoaderManager().restartLoader(DEBUG_INFO_LOADER, Bundle.EMPTY,
+                mBatteryInfoDebugLoaderCallbacks);
     }
 
     @VisibleForTesting
@@ -581,15 +712,18 @@
         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) {
@@ -601,6 +735,11 @@
     }
 
     @VisibleForTesting
+    String extractKeyFromUid(int uid) {
+        return Integer.toString(uid);
+    }
+
+    @VisibleForTesting
     void setBatteryLayoutPreference(LayoutPreference layoutPreference) {
         mBatteryLayoutPref = layoutPreference;
     }
@@ -612,6 +751,32 @@
                 .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 @@
         }
     };
 
+    @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 @@
                 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 @@
 
                 @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 0000000..b070b26
--- /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 0000000..0c401b5
--- /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 0000000..69d03b9
--- /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 0000000..596eaf5
--- /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 0000000..9884fbd
--- /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 0000000..59c8b2c
--- /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 0000000..491a3b4
--- /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 0000000..4a9c2a9
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapper.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge.anomaly;
+
+import android.util.KeyValueListParser;
+
+/**
+ * This interface replicates a subset of the {@link KeyValueListParser}. The interface
+ * exists so that we can use a thin wrapper around the PM in production code and a mock in tests.
+ * We cannot directly mock or shadow the {@link KeyValueListParser}, because some of the methods
+ * we rely on are newer than the API version supported by Robolectric.
+ */
+public interface KeyValueListParserWrapper {
+
+    /**
+     * Get real {@link KeyValueListParser}
+     */
+    KeyValueListParser getKeyValueListParser();
+
+    /**
+     * Resets the parser with a new string to parse. The string is expected to be in the following
+     * format:
+     * <pre>key1=value,key2=value,key3=value</pre>
+     *
+     * where the delimiter is a comma.
+     *
+     * @param str the string to parse.
+     * @throws IllegalArgumentException if the string is malformed.
+     */
+    void setString(String str) throws IllegalArgumentException;
+
+    /**
+     * Get the value for key as a boolean.
+     * @param key The key to lookup.
+     * @param defaultValue The value to return if the key was not found.
+     * @return the string value associated with the key.
+     */
+    boolean getBoolean(String key, boolean defaultValue);
+
+    /**
+     * Get the value for key as a long.
+     * @param key The key to lookup.
+     * @param defaultValue The value to return if the key was not found, or the value was not a
+     *                     long.
+     * @return the long value associated with the key.
+     */
+    long getLong(String key, long defaultValue);
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java
new file mode 100644
index 0000000..f724034
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/KeyValueListParserWrapperImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge.anomaly;
+
+import android.util.KeyValueListParser;
+
+/**
+ * Impl of {@link KeyValueListParser}
+ */
+public class KeyValueListParserWrapperImpl implements KeyValueListParserWrapper {
+    private KeyValueListParser mParser;
+
+    public KeyValueListParserWrapperImpl(KeyValueListParser parser) {
+        mParser = parser;
+    }
+
+    @Override
+    public KeyValueListParser getKeyValueListParser() {
+        return mParser;
+    }
+
+    @Override
+    public void setString(String str) throws IllegalArgumentException {
+        mParser.setString(str);
+    }
+
+    @Override
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return mParser.getBoolean(key, defaultValue);
+    }
+
+    @Override
+    public long getLong(String key, long defaultValue) {
+        return mParser.getLong(key, defaultValue);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java b/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.java
new file mode 100644
index 0000000..87212e7
--- /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 0000000..aa3fc39
--- /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 0000000..fb7306a
--- /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 0000000..b0e34fa
--- /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 0000000..dba221a
--- /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 0000000..1921bef
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/AnomalyDetector.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package com.android.settings.fuelgauge.anomaly.checker;
+
+import android.annotation.Nullable;
+
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+import java.util.List;
+
+public interface AnomalyDetector {
+    /**
+     * Detect whether there is anomaly among all the applications in the device
+     *
+     * @param batteryStatsHelper used to detect the anomaly
+     * @return anomaly list
+     */
+    List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper);
+
+    /**
+     * Detect whether application with {@code targetPackageName} has anomaly. When
+     * {@code targetPackageName} is null, start detection among all the applications.
+     *
+     * @param batteryStatsHelper used to detect the anomaly
+     * @param targetPackageName  represents the app need to be detected
+     * @return anomaly list
+     */
+    List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper,
+            @Nullable String targetPackageName);
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java
new file mode 100644
index 0000000..9fb4496
--- /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 0000000..c2bcd9a
--- /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 0000000..8823a17
--- /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 f06f6c1..447562d 100644
--- a/src/com/android/settings/gestures/AssistGestureFeatureProvider.java
+++ b/src/com/android/settings/gestures/AssistGestureFeatureProvider.java
@@ -18,10 +18,21 @@
 
 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 b17d892..4509862 100644
--- a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java
+++ b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java
@@ -18,6 +18,13 @@
 
 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 @@
         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 c858511..b91f230 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 @@
 
     @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 @@
         }
     }
 
-    @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);
             }
@@ -97,10 +122,32 @@
     }
 
     @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 @@
     @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 {
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                AssistGestureSettings.class.getName(), mAssistGesturePrefKey,
+                mContext.getString(R.string.display_settings));
 
-        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 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 5334e62..0000000
--- 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 0c4f278..dd0a991 100644
--- a/src/com/android/settings/gestures/AssistGestureSettings.java
+++ b/src/com/android/settings/gestures/AssistGestureSettings.java
@@ -22,9 +22,10 @@
 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 @@
 
     @Override
     public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.VIEW_UNKNOWN;
+        return MetricsProto.MetricsEvent.SETTINGS_ASSIST_GESTURE;
     }
 
     @Override
@@ -59,8 +60,11 @@
     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 ba1d0f6..970b6a7 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 @@
     @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 a880c32..4efe3be 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 @@
     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 5f8dfb4..9ec06ae 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
@@ -18,17 +18,30 @@
 
 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 @@
         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 @@
     @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 @@
     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 0804e7b..0cc0365 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.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 @@
     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;
@@ -53,6 +68,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_double_tap_screen;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
index cf5cfab..e5fb9a0 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 @@
     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 12f28d2..922f74b 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 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 @@
         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 @@
 
     @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 ebfccb5..a5df949 100644
--- a/src/com/android/settings/gestures/GesturePreferenceController.java
+++ b/src/com/android/settings/gestures/GesturePreferenceController.java
@@ -23,11 +23,11 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
 import com.android.settings.widget.VideoPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
 public abstract class GesturePreferenceController extends PreferenceController
         implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop {
@@ -61,6 +61,8 @@
                         ? 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 @@
     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 c0e6009..e64c0cf 100644
--- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
@@ -18,17 +18,30 @@
 
 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 @@
         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 @@
 
     @Override
     protected String getVideoPrefKey() {
-        return PREF_VIDEO_KEY;
+        return PREF_KEY_VIDEO;
     }
 
     @Override
@@ -65,7 +84,22 @@
     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 874f690..7cc264c 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.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 @@
     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;
@@ -53,6 +68,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_pickup_gesture;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context, getLifecycle());
     }
diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
index 2a62674..6f334a5 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 @@
 
     @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 f19565a..05a1202 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 @@
 
     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 0000000..45fab38
--- /dev/null
+++ b/src/com/android/settings/graph/BottomLabelLayout.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package com.android.settings.graph;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.settingslib.R;
+
+/**
+ * An extension of LinearLayout that automatically switches to vertical
+ * orientation when it can't fit its child views horizontally.
+ *
+ * Main logic in this class comes from {@link android.support.v7.widget.ButtonBarLayout}.
+ * Compared with {@link android.support.v7.widget.ButtonBarLayout}, this layout won't reverse
+ * children's order and won't update the minimum height
+ */
+public class BottomLabelLayout extends LinearLayout {
+    private static final String TAG = "BottomLabelLayout";
+
+    public BottomLabelLayout(Context context,
+            @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        final boolean isStacked = isStacked();
+        boolean needsRemeasure = false;
+
+        // If we're not stacked, make sure the measure spec is AT_MOST rather
+        // than EXACTLY. This ensures that we'll still get TOO_SMALL so that we
+        // know to stack the buttons.
+        final int initialWidthMeasureSpec;
+        if (!isStacked && MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY) {
+            initialWidthMeasureSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.AT_MOST);
+
+            // We'll need to remeasure again to fill excess space.
+            needsRemeasure = true;
+        } else {
+            initialWidthMeasureSpec = widthMeasureSpec;
+        }
+
+        super.onMeasure(initialWidthMeasureSpec, heightMeasureSpec);
+        if (!isStacked) {
+            final int measuredWidth = getMeasuredWidthAndState();
+            final int measuredWidthState = measuredWidth & View.MEASURED_STATE_MASK;
+
+            if (measuredWidthState == View.MEASURED_STATE_TOO_SMALL) {
+                setStacked(true);
+                // Measure again in the new orientation.
+                needsRemeasure = true;
+            }
+        }
+
+        if (needsRemeasure) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+
+    }
+
+    @VisibleForTesting
+    void setStacked(boolean stacked) {
+        setOrientation(stacked ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
+        setGravity(stacked ? Gravity.START : Gravity.BOTTOM);
+
+        final View spacer = findViewById(R.id.spacer);
+        if (spacer != null) {
+            spacer.setVisibility(stacked ? View.GONE : View.VISIBLE);
+        }
+    }
+
+    private boolean isStacked() {
+        return getOrientation() == LinearLayout.VERTICAL;
+    }
+}
diff --git a/src/com/android/settings/graph/UsageGraph.java b/src/com/android/settings/graph/UsageGraph.java
new file mode 100644
index 0000000..a39cb43
--- /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 0000000..38eb027
--- /dev/null
+++ b/src/com/android/settings/graph/UsageView.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.graph;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.util.SparseIntArray;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.android.settingslib.R;
+
+public class UsageView extends FrameLayout {
+
+    private final UsageGraph mUsageGraph;
+    private final TextView[] mLabels;
+    private final TextView[] mBottomLabels;
+
+    public UsageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        LayoutInflater.from(context).inflate(R.layout.usage_view, this);
+        mUsageGraph = findViewById(R.id.usage_graph);
+        mLabels = new TextView[] {
+                findViewById(R.id.label_bottom),
+                findViewById(R.id.label_middle),
+                findViewById(R.id.label_top),
+        };
+        mBottomLabels = new TextView[] {
+                findViewById(R.id.label_start),
+                findViewById(R.id.label_end),
+        };
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.UsageView, 0, 0);
+        if (a.hasValue(R.styleable.UsageView_sideLabels)) {
+            setSideLabels(a.getTextArray(R.styleable.UsageView_sideLabels));
+        }
+        if (a.hasValue(R.styleable.UsageView_bottomLabels)) {
+            setBottomLabels(a.getTextArray(R.styleable.UsageView_bottomLabels));
+        }
+        if (a.hasValue(R.styleable.UsageView_textColor)) {
+            int color = a.getColor(R.styleable.UsageView_textColor, 0);
+            for (TextView v : mLabels) {
+                v.setTextColor(color);
+            }
+            for (TextView v : mBottomLabels) {
+                v.setTextColor(color);
+            }
+        }
+        if (a.hasValue(R.styleable.UsageView_android_gravity)) {
+            int gravity = a.getInt(R.styleable.UsageView_android_gravity, 0);
+            if (gravity == Gravity.END) {
+                LinearLayout layout = findViewById(R.id.graph_label_group);
+                LinearLayout labels = findViewById(R.id.label_group);
+                // Swap the children order.
+                layout.removeView(labels);
+                layout.addView(labels);
+                // Set gravity.
+                labels.setGravity(Gravity.END);
+                // Swap the bottom space order.
+                LinearLayout bottomLabels = findViewById(R.id.bottom_label_group);
+                View bottomSpace = bottomLabels.findViewById(R.id.bottom_label_space);
+                bottomLabels.removeView(bottomSpace);
+                bottomLabels.addView(bottomSpace);
+            } else if (gravity != Gravity.START) {
+                throw new IllegalArgumentException("Unsupported gravity " + gravity);
+            }
+        }
+        mUsageGraph.setAccentColor(a.getColor(R.styleable.UsageView_android_colorAccent, 0));
+    }
+
+    public void clearPaths() {
+        mUsageGraph.clearPaths();
+    }
+
+    public void addPath(SparseIntArray points) {
+        mUsageGraph.addPath(points);
+    }
+
+    public void addProjectedPath(SparseIntArray points) {
+        mUsageGraph.addProjectedPath(points);
+    }
+
+    public void configureGraph(int maxX, int maxY) {
+        mUsageGraph.setMax(maxX, maxY);
+    }
+
+    public void setAccentColor(int color) {
+        mUsageGraph.setAccentColor(color);
+    }
+
+    public void setDividerLoc(int dividerLoc) {
+        mUsageGraph.setDividerLoc(dividerLoc);
+    }
+
+    public void setDividerColors(int middleColor, int topColor) {
+        mUsageGraph.setDividerColors(middleColor, topColor);
+    }
+
+    public void setSideLabelWeights(float before, float after) {
+        setWeight(R.id.space1, before);
+        setWeight(R.id.space2, after);
+    }
+
+    private void setWeight(int id, float weight) {
+        View v = findViewById(id);
+        LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) v.getLayoutParams();
+        params.weight = weight;
+        v.setLayoutParams(params);
+    }
+
+    public void setSideLabels(CharSequence[] labels) {
+        if (labels.length != mLabels.length) {
+            throw new IllegalArgumentException("Invalid number of labels");
+        }
+        for (int i = 0; i < mLabels.length; i++) {
+            mLabels[i].setText(labels[i]);
+        }
+    }
+
+    public void setBottomLabels(CharSequence[] labels) {
+        if (labels.length != mBottomLabels.length) {
+            throw new IllegalArgumentException("Invalid number of labels");
+        }
+        for (int i = 0; i < mBottomLabels.length; i++) {
+            mBottomLabels[i].setText(labels[i]);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
index f8232b8..40efb07 100644
--- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
@@ -26,9 +26,9 @@
 import android.view.InputDevice;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class GameControllerPreferenceController extends PreferenceController
         implements InputManager.InputDeviceListener, LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
index aa9f5ad..03d8221 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
@@ -22,11 +22,11 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index 1c4d642..cca6cbe 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.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.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 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 @@
 
         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 @@
 
         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 766ee47..bd7aea1 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
@@ -38,6 +67,21 @@
     }
 
     @Override
+    public void onResume() {
+        if (mLocationProvidersChangedReceiver != null) {
+            mContext.registerReceiver(mLocationProvidersChangedReceiver, new IntentFilter(
+                    LocationManager.PROVIDERS_CHANGED_ACTION));
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mLocationProvidersChangedReceiver != null) {
+            mContext.unregisterReceiver(mLocationProvidersChangedReceiver);
+        }
+    }
+
+    @Override
     public void updateState(Preference preference) {
         preference.setSummary(getLocationSummary(mContext));
     }
@@ -58,10 +102,10 @@
 
     public static String getLocationSummary(Context context) {
         int mode = Secure.getInt(context.getContentResolver(),
-            Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
+                Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
         if (mode != Secure.LOCATION_MODE_OFF) {
             return context.getString(R.string.location_on_summary,
-                context.getString(getLocationString(mode)));
+                    context.getString(getLocationString(mode)));
         }
         return context.getString(R.string.location_off_summary);
     }
@@ -80,4 +124,14 @@
         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 69fbd5c..741d607 100644
--- a/src/com/android/settings/location/LocationSettingsBase.java
+++ b/src/com/android/settings/location/LocationSettingsBase.java
@@ -85,13 +85,23 @@
     /** 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 @@
             }
             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 @@
             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 a25c5f8..05c428a 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -29,10 +29,10 @@
 import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class AirplaneModePreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume, OnPause {
@@ -45,7 +45,6 @@
 
     private final Fragment mFragment;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
-    private final PackageManager mPackageManager;
     private AirplaneModeEnabler mAirplaneModeEnabler;
     private SwitchPreference mAirplaneModePreference;
 
@@ -53,7 +52,6 @@
     public AirplaneModePreferenceController(Context context, Fragment hostFragment) {
         super(context);
         mFragment = hostFragment;
-        mPackageManager = context.getPackageManager();
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
     }
 
@@ -88,7 +86,11 @@
 
     @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 c7abf90..5922045 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -26,24 +26,23 @@
 
 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 @@
 
     @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 9d0878f8..da4902d 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -32,9 +32,9 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnCreate;
-import com.android.settings.core.lifecycle.events.OnSaveInstanceState;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index a28a726..35de1bb 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -15,10 +15,12 @@
  */
 package com.android.settings.network;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
+import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -26,11 +28,11 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -68,6 +70,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_network_dashboard;
+    }
+
+    @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         mNetworkResetController.buildMenuItem(menu);
@@ -133,6 +140,66 @@
         return 0;
     }
 
+    @VisibleForTesting
+    static class SummaryProvider implements SummaryLoader.SummaryProvider {
+
+        private final Context mContext;
+        private final SummaryLoader mSummaryLoader;
+        private final MobileNetworkPreferenceController mMobileNetworkPreferenceController;
+        private final TetherPreferenceController mTetherPreferenceController;
+
+        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+            this(context, summaryLoader,
+                    new MobileNetworkPreferenceController(context),
+                    new TetherPreferenceController(context, null /* lifecycle */));
+        }
+
+        @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+        SummaryProvider(Context context, SummaryLoader summaryLoader,
+                MobileNetworkPreferenceController mobileNetworkPreferenceController,
+                TetherPreferenceController tetherPreferenceController) {
+            mContext = context;
+            mSummaryLoader = summaryLoader;
+            mMobileNetworkPreferenceController = mobileNetworkPreferenceController;
+            mTetherPreferenceController = tetherPreferenceController;
+        }
+
+
+        @Override
+        public void setListening(boolean listening) {
+            if (listening) {
+                String summary = mContext.getString(R.string.wifi_settings_title);
+                if (mMobileNetworkPreferenceController.isAvailable()) {
+                    final String mobileSettingSummary = mContext.getString(
+                            R.string.network_dashboard_summary_mobile);
+                    summary = mContext.getString(R.string.join_many_items_middle, summary,
+                            mobileSettingSummary);
+                }
+                final String dataUsageSettingSummary = mContext.getString(
+                        R.string.network_dashboard_summary_data_usage);
+                summary = mContext.getString(R.string.join_many_items_middle, summary,
+                        dataUsageSettingSummary);
+                if (mTetherPreferenceController.isAvailable()) {
+                    final String hotspotSettingSummary = mContext.getString(
+                            R.string.network_dashboard_summary_hotspot);
+                    summary = mContext.getString(R.string.join_many_items_middle, summary,
+                            hotspotSettingSummary);
+                }
+                mSummaryLoader.setSummary(this, summary);
+            }
+        }
+    }
+
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+            = new SummaryLoader.SummaryProviderFactory() {
+        @Override
+        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                SummaryLoader summaryLoader) {
+            return new SummaryProvider(activity, summaryLoader);
+        }
+    };
+
+
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
@@ -145,7 +212,7 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    List<String> keys = new ArrayList<>();
+                    List<String> keys = super.getNonIndexableKeys(context);
                     // Remove master switch as a result
                     keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI);
                     return keys;
diff --git a/src/com/android/settings/network/RestrictedLockUtilsWrapper.java b/src/com/android/settings/network/RestrictedLockUtilsWrapper.java
new file mode 100644
index 0000000..de5b808
--- /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 fab700b..933bc8a 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -25,6 +25,7 @@
 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 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 @@
     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 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
@@ -131,6 +130,14 @@
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (mBluetoothAdapter != null) {
+            mBluetoothAdapter.getProfileProxy(mContext, mBtProfileServiceListener,
+                    BluetoothProfile.PAN);
+        }
+    }
+
+    @Override
     public void onResume() {
         if (mAirplaneModeObserver == null) {
             mAirplaneModeObserver = new SettingObserver();
@@ -139,7 +146,7 @@
             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 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 72b361a..a62be76 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -40,10 +40,10 @@
 import com.android.internal.net.VpnConfig;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 5bda1ad..14ee779 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -98,6 +98,7 @@
         // 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 072d454..239377d 100644
--- a/src/com/android/settings/nfc/NfcPaymentPreference.java
+++ b/src/com/android/settings/nfc/NfcPaymentPreference.java
@@ -30,9 +30,9 @@
 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 7164b5b..e5d47fb 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -27,12 +27,12 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.network.AirplaneModePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
@@ -66,10 +66,8 @@
         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 @@
         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 6f8a174..d914cd8 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -33,14 +33,13 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
 
-import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -163,11 +162,13 @@
 
             @Override
             public List<String> getNonIndexableKeys(Context context) {
+                final List<String> nonVisibleKeys = super.getNonIndexableKeys(context);
                 final PackageManager pm = context.getPackageManager();
-                if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) return null;
-                final List<String> nonVisibleKeys = new ArrayList<String>();
+                if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
+                    return nonVisibleKeys;
+                }
                 nonVisibleKeys.add(PAYMENT_KEY);
                 return nonVisibleKeys;
             }
-    };
+        };
 }
diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
index e9c4b57..cd1f6e3 100644
--- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java
+++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
@@ -20,8 +20,8 @@
 import android.media.AudioManager;
 
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class AlarmVolumePreferenceController extends
     VolumeSeekBarPreferenceController {
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 6b6b183..5cac0bb 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -16,10 +16,6 @@
 
 package com.android.settings.notification;
 
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
-
 import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
@@ -41,21 +37,24 @@
 import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.Utils;
-import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.notification.NotificationBackend.AppRow;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.FooterPreference;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.widget.FooterPreference;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
 /** These settings are per app, so should not be returned in global search results. */
 public class AppNotificationSettings extends NotificationSettingsBase {
     private static final String TAG = "AppNotificationSettings";
@@ -127,19 +126,19 @@
     }
 
     private void addHeaderPref() {
-        ArrayMap<String, AppRow> rows = new ArrayMap<String, AppRow>();
+        ArrayMap<String, AppRow> rows = new ArrayMap<>();
         rows.put(mAppRow.pkg, mAppRow);
         collectConfigActivities(rows);
         final Activity activity = getActivity();
-        final Preference pref = FeatureFactory.getFactory(activity)
-                .getApplicationFeatureProvider(activity)
-                .newAppHeaderController(this /* fragment */, null /* appHeader */)
+        final Preference pref = EntityHeaderController
+                .newInstance(activity, this /* fragment */, null /* header */)
+                .setRecyclerView(getListView(), getLifecycle())
                 .setIcon(mAppRow.icon)
                 .setLabel(mAppRow.label)
                 .setPackageName(mAppRow.pkg)
                 .setUid(mAppRow.uid)
-                .setButtonActions(AppHeaderController.ActionType.ACTION_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 225ede5..d77be7b 100644
--- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -18,6 +18,7 @@
 
 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.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 @@
 
     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 @@
     @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 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 @@
             }
         }
     }
+
+    @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 3bd0557..6c052d5 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -16,10 +16,6 @@
 
 package com.android.settings.notification;
 
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
-
 import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
@@ -44,13 +40,16 @@
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
 import com.android.settings.Utils;
-import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.FooterPreference;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.widget.FooterPreference;
+
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
 
 public class ChannelNotificationSettings extends NotificationSettingsBase {
     private static final String TAG = "ChannelSettings";
@@ -66,7 +65,7 @@
     private NotificationSoundPreference mRingtone;
     private FooterPreference mFooter;
     private NotificationChannelGroup mChannelGroup;
-    private AppHeaderController mHeaderPref;
+    private EntityHeaderController mHeaderPref;
 
     @Override
     public int getMetricsCategory() {
@@ -134,21 +133,21 @@
     }
 
     private void addHeaderPref() {
-        ArrayMap<String, NotificationBackend.AppRow> rows = new ArrayMap<String, NotificationBackend.AppRow>();
+        ArrayMap<String, NotificationBackend.AppRow> rows = new ArrayMap<>();
         rows.put(mAppRow.pkg, mAppRow);
         collectConfigActivities(rows);
         final Activity activity = getActivity();
-        mHeaderPref = FeatureFactory.getFactory(activity)
-                .getApplicationFeatureProvider(activity)
-                .newAppHeaderController(this /* fragment */, null /* appHeader */);
+        mHeaderPref = EntityHeaderController
+                .newInstance(activity, this /* fragment */, null /* header */)
+                .setRecyclerView(getListView(), getLifecycle());
         final Preference pref = mHeaderPref
                 .setIcon(mAppRow.icon)
                 .setLabel(mChannel.getName())
                 .setSummary(mAppRow.label)
                 .setPackageName(mAppRow.pkg)
                 .setUid(mAppRow.uid)
-                .setButtonActions(AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
                 .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
     }
@@ -353,7 +352,9 @@
         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 1114b4a..55cba96 100644
--- a/src/com/android/settings/notification/ChargingSoundPreferenceController.java
+++ b/src/com/android/settings/notification/ChargingSoundPreferenceController.java
@@ -22,7 +22,7 @@
 
 import android.provider.Settings.Global;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ChargingSoundPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index a06d069..26fc0a0 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -16,17 +16,21 @@
 
 package com.android.settings.notification;
 
+import android.app.Activity;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.applications.NotificationApps;
+import com.android.settings.applications.NotificationApps.SummaryProvider;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.gestures.SwipeToNotificationPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -81,6 +85,15 @@
         return controllers;
     }
 
+    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+        = new SummaryLoader.SummaryProviderFactory() {
+            @Override
+            public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+                    SummaryLoader summaryLoader) {
+                return new NotificationApps.SummaryProvider(activity, summaryLoader);
+            }
+    };
+
     /**
      * For Search.
      */
diff --git a/src/com/android/settings/notification/DialPadTonePreferenceController.java b/src/com/android/settings/notification/DialPadTonePreferenceController.java
index 08e1a7d..e0ca299 100644
--- a/src/com/android/settings/notification/DialPadTonePreferenceController.java
+++ b/src/com/android/settings/notification/DialPadTonePreferenceController.java
@@ -23,7 +23,7 @@
 import android.provider.Settings.System;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class DialPadTonePreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
index 20c20b4..f7f13c5 100644
--- a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
+++ b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
@@ -24,7 +24,7 @@
 import android.provider.Settings.Global;
 import android.telephony.TelephonyManager;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class DockAudioMediaPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/DockingSoundPreferenceController.java b/src/com/android/settings/notification/DockingSoundPreferenceController.java
index ee277f0..476fd6a 100644
--- a/src/com/android/settings/notification/DockingSoundPreferenceController.java
+++ b/src/com/android/settings/notification/DockingSoundPreferenceController.java
@@ -22,7 +22,7 @@
 import android.provider.Settings.Global;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class DockingSoundPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/EmergencyTonePreferenceController.java b/src/com/android/settings/notification/EmergencyTonePreferenceController.java
index bc21f44..a67ec8a 100644
--- a/src/com/android/settings/notification/EmergencyTonePreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyTonePreferenceController.java
@@ -25,7 +25,7 @@
 import android.telephony.TelephonyManager;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class EmergencyTonePreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
index 1f0c4a8..228e185 100644
--- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -33,10 +33,10 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java
index fb8dba5..4f167f8 100644
--- a/src/com/android/settings/notification/MediaVolumePreferenceController.java
+++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java
@@ -18,8 +18,8 @@
 
 import android.content.Context;
 import android.media.AudioManager;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class MediaVolumePreferenceController extends
     VolumeSeekBarPreferenceController {
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index c7b366e..48ca207 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -26,10 +26,10 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.widget.FooterPreference;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.widget.FooterPreference;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
index 40448a4..5f888f8 100644
--- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java
+++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
@@ -21,8 +21,8 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.Utils;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class NotificationVolumePreferenceController extends
     RingVolumePreferenceController {
diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
index 3e37ab0..d6db8ac 100644
--- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
@@ -28,9 +28,9 @@
 import android.util.Log;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;
 
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index b269062..93c14c7 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -23,6 +23,7 @@
 
 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.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;
 
@@ -54,6 +56,12 @@
     }
 
     @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 a94d086..8b78225 100644
--- a/src/com/android/settings/notification/RingVolumePreferenceController.java
+++ b/src/com/android/settings/notification/RingVolumePreferenceController.java
@@ -33,8 +33,8 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.Utils;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.Objects;
 
diff --git a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
index f9905c0..b08b8f8 100644
--- a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
+++ b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
@@ -22,7 +22,7 @@
 
 import android.provider.Settings.System;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ScreenLockSoundPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java
index 64d65bb..413b4a2 100644
--- a/src/com/android/settings/notification/SettingPrefController.java
+++ b/src/com/android/settings/notification/SettingPrefController.java
@@ -28,10 +28,10 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 import java.util.List;
 
 public abstract class SettingPrefController extends PreferenceController implements
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index ec7351a..8bee301 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -32,9 +32,9 @@
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/settings/notification/TouchSoundPreferenceController.java b/src/com/android/settings/notification/TouchSoundPreferenceController.java
index 4ca5ea0..4e25507 100644
--- a/src/com/android/settings/notification/TouchSoundPreferenceController.java
+++ b/src/com/android/settings/notification/TouchSoundPreferenceController.java
@@ -24,7 +24,7 @@
 import android.os.AsyncTask;
 import android.provider.Settings.System;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class TouchSoundPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java
index 544c372..acb6b4d 100644
--- a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java
+++ b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java
@@ -22,7 +22,7 @@
 import android.os.Vibrator;
 import android.provider.Settings.System;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class VibrateOnTouchPreferenceController extends SettingPrefController {
 
diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
index 2160f3d..338b652 100644
--- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
+++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
@@ -28,9 +28,9 @@
 
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static android.provider.Settings.System.VIBRATE_WHEN_RINGING;
 
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index b4fe6d8..89f1e27 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -21,6 +21,7 @@
 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.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 @@
     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 eeb9c28..501cedc 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
@@ -19,11 +19,11 @@
 import android.content.Context;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * Base class for preference controller that handles VolumeSeekBarPreference
diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java
index a80f503..465a2ec 100644
--- a/src/com/android/settings/notification/WorkSoundPreferenceController.java
+++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java
@@ -45,10 +45,10 @@
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class WorkSoundPreferenceController extends PreferenceController implements
         OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 854857a..e6b10c3 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -45,6 +45,7 @@
 
 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 @@
                 ? 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 @@
         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 @@
 
             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 @@
             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 @@
         };
     }
 
-    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 @@
 
         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 @@
             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 e7d5088..4c4621a 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -22,6 +22,7 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.bluetooth.BluetoothFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -30,7 +31,7 @@
 import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.search2.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
 
 /**
@@ -97,6 +98,8 @@
 
     public abstract UserFeatureProvider getUserFeatureProvider(Context context);
 
+    public abstract BluetoothFeatureProvider getBluetoothFeatureProvider(Context context);
+
     public static final class FactoryNotFoundException extends RuntimeException {
         public FactoryNotFoundException(Throwable throwable) {
             super("Unable to create factory. Did you misconfigure Proguard?", throwable);
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index b39a2a0..d4ee912 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -27,6 +27,8 @@
 import com.android.settings.applications.ApplicationFeatureProviderImpl;
 import com.android.settings.applications.IPackageManagerWrapperImpl;
 import com.android.settings.applications.PackageManagerWrapperImpl;
+import com.android.settings.bluetooth.BluetoothFeatureProvider;
+import com.android.settings.bluetooth.BluetoothFeatureProviderImpl;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProviderImpl;
@@ -41,8 +43,8 @@
 import com.android.settings.gestures.AssistGestureFeatureProviderImpl;
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProviderImpl;
-import com.android.settings.search2.SearchFeatureProvider;
-import com.android.settings.search2.SearchFeatureProviderImpl;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProviderImpl;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.security.SecurityFeatureProviderImpl;
 import com.android.settings.users.UserFeatureProvider;
@@ -66,6 +68,7 @@
     private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
     private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
     private UserFeatureProvider mUserFeatureProvider;
+    private BluetoothFeatureProvider mBluetoothFeatureProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -169,6 +172,14 @@
     }
 
     @Override
+    public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
+        if (mBluetoothFeatureProvider == null) {
+            mBluetoothFeatureProvider = new BluetoothFeatureProviderImpl();
+        }
+        return mBluetoothFeatureProvider;
+    }
+
+    @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         if (mAssistGestureFeatureProvider == null) {
             mAssistGestureFeatureProvider = new AssistGestureFeatureProviderImpl();
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index 0f8d424..55d5d0e 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -24,8 +24,8 @@
 import android.app.FragmentManager;
 import android.content.Context;
 import android.content.Intent;
-
 import android.os.Bundle;
+
 import com.android.settings.support.SupportPhone;
 
 import java.lang.annotation.Retention;
@@ -123,12 +123,26 @@
      * Starts support activity of specified type
      *
      * @param activity Calling activity
-     * @param account A account that selected by user
-     * @param type The type of support account needs.
+     * @param account  A account that selected by user
+     * @param type     The type of support account needs.
      */
     void startSupport(Activity activity, Account account, @SupportType int type);
 
     /**
+     * Starts support v2, invokes the support home page. Will no-op if support v2 is not enabled.
+     *
+     * @param activity Calling activity.
+     */
+    void startSupportV2(Activity activity);
+
+    /**
+     * Checks if support v2 is enabled for this device.
+     *
+     * @return a boolean indicating if support v2 is enabled.
+     */
+    boolean isSupportV2Enabled();
+
+    /**
      * Returns an {@link Intent} that opens help and allow user get help on sign in.
      */
     Intent getSignInHelpIntent(Context context);
@@ -153,4 +167,9 @@
      * launches the fragment that displays the system information being sent to support agents.
      */
     void launchSystemInfoFragment(Bundle args, FragmentManager manager);
+
+    /**
+     * Returns a url with information to introduce user to new device.
+     */
+    String getNewDeviceIntroUrl(Context context);
 }
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
similarity index 73%
rename from src/com/android/settings/ChooseLockGeneric.java
rename to src/com/android/settings/password/ChooseLockGeneric.java
index 49784f6..4d20bcf 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD;
 import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;
-import static com.android.settings.ChooseLockPassword.ChooseLockPasswordFragment.RESULT_FINISHED;
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment.RESULT_FINISHED;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
@@ -29,7 +29,6 @@
 import android.app.FragmentManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.UserInfo;
 import android.hardware.fingerprint.Fingerprint;
@@ -40,6 +39,7 @@
 import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.security.KeyStore;
+import android.support.annotation.StringRes;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
@@ -50,10 +50,17 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.EncryptionInterstitial;
+import com.android.settings.EventLogTags;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.fingerprint.FingerprintEnrollBase;
 import com.android.settings.fingerprint.FingerprintEnrollFindSensor;
 import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
 
 import java.util.List;
@@ -88,14 +95,9 @@
     }
 
     public static class ChooseLockGenericFragment extends SettingsPreferenceFragment {
+
         private static final String TAG = "ChooseLockGenericFragment";
         private static final int MIN_PASSWORD_LENGTH = 4;
-        private static final String KEY_UNLOCK_SET_OFF = "unlock_set_off";
-        private static final String KEY_UNLOCK_SET_NONE = "unlock_set_none";
-        private static final String KEY_UNLOCK_SET_PIN = "unlock_set_pin";
-        private static final String KEY_UNLOCK_SET_PASSWORD = "unlock_set_password";
-        private static final String KEY_UNLOCK_SET_PATTERN = "unlock_set_pattern";
-        private static final String KEY_UNLOCK_SET_MANAGED = "unlock_set_managed";
         private static final String KEY_SKIP_FINGERPRINT = "unlock_skip_fingerprint";
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
         private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
@@ -105,6 +107,27 @@
         public static final String ENCRYPT_REQUESTED_DISABLED = "encrypt_requested_disabled";
         public static final String TAG_FRP_WARNING_DIALOG = "frp_warning_dialog";
 
+        /**
+         * Boolean extra determining whether a "screen lock options" button should be shown. This
+         * extra is both sent and received by ChooseLockGeneric.
+         *
+         * When this extra is false, nothing will be done.
+         * When ChooseLockGeneric receives this extra set as true, and if ChooseLockGeneric is
+         * starting ChooseLockPassword or ChooseLockPattern automatically without user interaction,
+         * ChooseLockGeneric will set this extra to true when starting ChooseLockPassword/Pattern.
+         *
+         * This gives the user the choice to select a different screen lock type, even if
+         * ChooseLockGeneric selected a default.
+         */
+        public static final String EXTRA_SHOW_OPTIONS_BUTTON = "show_options_button";
+
+        /**
+         * Original intent extras used to start this activity. This is passed to ChooseLockPassword
+         * when the "screen lock options" button is shown, so that when that button is clicked,
+         * ChooseLockGeneric can be relaunched with the same extras.
+         */
+        public static final String EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS = "choose_lock_generic_extras";
+
         private static final int CONFIRM_EXISTING_REQUEST = 100;
         private static final int ENABLE_ENCRYPTION_REQUEST = 101;
         private static final int CHOOSE_LOCK_REQUEST = 102;
@@ -120,7 +143,6 @@
         private boolean mWaitingForConfirmation = false;
         private int mEncryptionRequestQuality;
         private boolean mEncryptionRequestDisabled;
-        private boolean mRequirePassword;
         private boolean mForChangeCredRequiredForBoot = false;
         private String mUserPassword;
         private LockPatternUtils mLockPatternUtils;
@@ -130,6 +152,7 @@
         private ManagedLockPasswordProvider mManagedPasswordProvider;
         private boolean mIsSetNewPassword = false;
         private UserManager mUserManager;
+        private ChooseLockGenericController mController;
 
         protected boolean mForFingerprint = false;
 
@@ -186,6 +209,7 @@
                     UserManager.get(getActivity()),
                     getArguments(),
                     getActivity().getIntent().getExtras()).getIdentifier();
+            mController = new ChooseLockGenericController(getContext(), mUserId);
             if (ACTION_SET_NEW_PASSWORD.equals(chooseLockAction)
                     && UserManager.get(getActivity()).isManagedProfile(mUserId)
                     && mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) {
@@ -271,7 +295,7 @@
                 mEncryptionRequestDisabled = disabled;
                 // Get the intent that the encryption interstitial should start for creating
                 // the new unlock method.
-                Intent unlockMethodIntent = getIntentForUnlockMethod(quality, disabled);
+                Intent unlockMethodIntent = getIntentForUnlockMethod(quality);
                 unlockMethodIntent.putExtra(
                         ChooseLockSettingsHelper.EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT,
                         mForChangeCredRequiredForBoot);
@@ -297,8 +321,7 @@
                     finish();
                     return;
                 }
-                mRequirePassword = false; // device encryption not enabled or not device owner.
-                updateUnlockMethodAndFinish(quality, disabled);
+                updateUnlockMethodAndFinish(quality, disabled, false /* chooseLockSkipped */);
             }
         }
 
@@ -323,6 +346,15 @@
                 if (resultCode != RESULT_CANCELED || mForChangeCredRequiredForBoot) {
                     getActivity().setResult(resultCode, data);
                     finish();
+                } else {
+                    // If PASSWORD_TYPE_KEY is set, this activity is used as a trampoline to start
+                    // the actual password enrollment. If the result is canceled, which means the
+                    // user pressed back, finish the activity with result canceled.
+                    int quality = getIntent().getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
+                    if (quality != -1) {
+                        getActivity().setResult(RESULT_CANCELED, data);
+                        finish();
+                    }
                 }
             } else if (requestCode == CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST
                     && resultCode == FingerprintEnrollBase.RESULT_FINISHED) {
@@ -369,7 +401,7 @@
             if (quality == -1) {
                 // If caller didn't specify password quality, show UI and allow the user to choose.
                 quality = intent.getIntExtra(MINIMUM_QUALITY_KEY, -1);
-                quality = upgradeQuality(quality);
+                quality = mController.upgradeQuality(quality);
                 final boolean hideDisabledPrefs = intent.getBooleanExtra(
                         HIDE_DISABLED_PREFS, false);
                 final PreferenceScreen prefScreen = getPreferenceScreen();
@@ -382,7 +414,7 @@
                 updateCurrentPreference();
                 updatePreferenceSummaryIfNeeded();
             } else {
-                updateUnlockMethodAndFinish(quality, false);
+                updateUnlockMethodAndFinish(quality, false, true /* chooseLockSkipped */);
             }
         }
 
@@ -390,33 +422,26 @@
             addPreferencesFromResource(R.xml.security_settings_picker);
 
             // Used for testing purposes
-            findPreference(KEY_UNLOCK_SET_NONE).setViewId(R.id.lock_none);
+            findPreference(ScreenLockType.NONE.preferenceKey).setViewId(R.id.lock_none);
             findPreference(KEY_SKIP_FINGERPRINT).setViewId(R.id.lock_none);
-            findPreference(KEY_UNLOCK_SET_PIN).setViewId(R.id.lock_pin);
-            findPreference(KEY_UNLOCK_SET_PASSWORD).setViewId(R.id.lock_password);
+            findPreference(ScreenLockType.PIN.preferenceKey).setViewId(R.id.lock_pin);
+            findPreference(ScreenLockType.PASSWORD.preferenceKey).setViewId(R.id.lock_password);
         }
 
         private void updatePreferenceText() {
             if (mForFingerprint) {
-                final String key[] = { KEY_UNLOCK_SET_PATTERN,
-                        KEY_UNLOCK_SET_PIN,
-                        KEY_UNLOCK_SET_PASSWORD };
-                final int res[] = { R.string.fingerprint_unlock_set_unlock_pattern,
-                        R.string.fingerprint_unlock_set_unlock_pin,
-                        R.string.fingerprint_unlock_set_unlock_password };
-                for (int i = 0; i < key.length; i++) {
-                    Preference pref = findPreference(key[i]);
-                    if (pref != null) { // can be removed by device admin
-                        pref.setTitle(res[i]);
-                    }
-                }
+                setPreferenceTitle(ScreenLockType.PATTERN,
+                        R.string.fingerprint_unlock_set_unlock_pattern);
+                setPreferenceTitle(ScreenLockType.PIN, R.string.fingerprint_unlock_set_unlock_pin);
+                setPreferenceTitle(ScreenLockType.PASSWORD,
+                        R.string.fingerprint_unlock_set_unlock_password);
             }
 
             if (mManagedPasswordProvider.isSettingManagedPasswordSupported()) {
-                Preference managed = findPreference(KEY_UNLOCK_SET_MANAGED);
-                managed.setTitle(mManagedPasswordProvider.getPickerOptionTitle(mForFingerprint));
+                setPreferenceTitle(ScreenLockType.MANAGED,
+                        mManagedPasswordProvider.getPickerOptionTitle(mForFingerprint));
             } else {
-                removePreference(KEY_UNLOCK_SET_MANAGED);
+                removePreference(ScreenLockType.MANAGED.preferenceKey);
             }
 
             if (!(mForFingerprint && mIsSetNewPassword)) {
@@ -424,6 +449,27 @@
             }
         }
 
+        private void setPreferenceTitle(ScreenLockType lock, @StringRes int title) {
+            Preference preference = findPreference(lock.preferenceKey);
+            if (preference != null) {
+                preference.setTitle(title);
+            }
+        }
+
+        private void setPreferenceTitle(ScreenLockType lock, CharSequence title) {
+            Preference preference = findPreference(lock.preferenceKey);
+            if (preference != null) {
+                preference.setTitle(title);
+            }
+        }
+
+        private void setPreferenceSummary(ScreenLockType lock, @StringRes int summary) {
+            Preference preference = findPreference(lock.preferenceKey);
+            if (preference != null) {
+                preference.setSummary(summary);
+            }
+        }
+
         private void updateCurrentPreference() {
             String currentKey = getKeyForCurrent();
             Preference preference = findPreference(currentKey);
@@ -436,39 +482,12 @@
             final int credentialOwner = UserManager.get(getContext())
                     .getCredentialOwnerProfile(mUserId);
             if (mLockPatternUtils.isLockScreenDisabled(credentialOwner)) {
-                return KEY_UNLOCK_SET_OFF;
+                return ScreenLockType.NONE.preferenceKey;
             }
-            switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(credentialOwner)) {
-                case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
-                    return KEY_UNLOCK_SET_PATTERN;
-                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
-                    return KEY_UNLOCK_SET_PIN;
-                case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
-                case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
-                    return KEY_UNLOCK_SET_PASSWORD;
-                case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
-                    return KEY_UNLOCK_SET_MANAGED;
-                case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED:
-                    return KEY_UNLOCK_SET_NONE;
-            }
-            return null;
-        }
-
-        /** increases the quality if necessary */
-        private int upgradeQuality(int quality) {
-            quality = upgradeQualityForDPM(quality);
-            return quality;
-        }
-
-        private int upgradeQualityForDPM(int quality) {
-            // Compare min allowed password quality
-            int minQuality = mDPM.getPasswordQuality(null, mUserId);
-            if (quality < minQuality) {
-                quality = minQuality;
-            }
-            return quality;
+            ScreenLockType lock =
+                    ScreenLockType.fromQuality(
+                            mLockPatternUtils.getKeyguardStoredPasswordQuality(credentialOwner));
+            return lock != null ? lock.preferenceKey : null;
         }
 
         /***
@@ -496,54 +515,17 @@
             int adminEnforcedQuality = mDPM.getPasswordQuality(null, mUserId);
             EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
                     getActivity(), mUserId);
-            for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
-                Preference pref = entries.getPreference(i);
+
+            for (ScreenLockType lock : ScreenLockType.values()) {
+                String key = lock.preferenceKey;
+                Preference pref = findPreference(key);
                 if (pref instanceof RestrictedPreference) {
-                    final String key = pref.getKey();
-                    boolean enabled = true;
-                    boolean visible = true;
-                    boolean disabledByAdmin = false;
-                    if (KEY_UNLOCK_SET_OFF.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                        if (getResources().getBoolean(R.bool.config_hide_none_security_option)) {
-                            enabled = false;
-                            visible = false;
-                        }
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                    } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
-                        if (getResources().getBoolean(R.bool.config_hide_swipe_security_option)) {
-                            enabled = false;
-                            visible = false;
-                        } else {
-                            if (mUserId != UserHandle.myUserId()) {
-                                // Swipe doesn't make sense for profiles.
-                                visible = false;
-                            }
-                            enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                        }
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
-                    } else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
-                    } else if (KEY_UNLOCK_SET_PIN.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
-                    } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
-                    } else if (KEY_UNLOCK_SET_MANAGED.equals(key)) {
-                        enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_MANAGED
-                                && mManagedPasswordProvider.isManagedPasswordChoosable();
-                        disabledByAdmin = adminEnforcedQuality
-                                > DevicePolicyManager.PASSWORD_QUALITY_MANAGED;
-                    }
+                    boolean visible = mController.isScreenLockVisible(lock);
+                    boolean enabled = mController.isScreenLockEnabled(lock, quality);
+                    boolean disabledByAdmin =
+                            mController.isScreenLockDisabledByAdmin(lock, adminEnforcedQuality);
                     if (hideDisabled) {
-                        visible = enabled;
+                        visible = visible && enabled;
                     }
                     if (!visible) {
                         entries.removePreference(pref);
@@ -578,61 +560,42 @@
                 return;
             }
 
-            CharSequence summary = getString(R.string.secure_lock_encryption_warning);
+            setPreferenceSummary(ScreenLockType.PATTERN, R.string.secure_lock_encryption_warning);
+            setPreferenceSummary(ScreenLockType.PIN, R.string.secure_lock_encryption_warning);
+            setPreferenceSummary(ScreenLockType.PASSWORD, R.string.secure_lock_encryption_warning);
+            setPreferenceSummary(ScreenLockType.MANAGED, R.string.secure_lock_encryption_warning);
+        }
 
-            PreferenceScreen screen = getPreferenceScreen();
-            final int preferenceCount = screen.getPreferenceCount();
-            for (int i = 0; i < preferenceCount; i++) {
-                Preference preference = screen.getPreference(i);
-                switch (preference.getKey()) {
-                    case KEY_UNLOCK_SET_PATTERN:
-                    case KEY_UNLOCK_SET_PIN:
-                    case KEY_UNLOCK_SET_PASSWORD:
-                    case KEY_UNLOCK_SET_MANAGED: {
-                        preference.setSummary(summary);
-                    } break;
-                }
+        protected Intent getLockManagedPasswordIntent(String password) {
+            return mManagedPasswordProvider.createIntent(false, password);
+        }
+
+        protected Intent getLockPasswordIntent(int quality, int minLength, int maxLength) {
+            ChooseLockPassword.IntentBuilder builder =
+                    new ChooseLockPassword.IntentBuilder(getContext())
+                            .setPasswordQuality(quality)
+                            .setPasswordLengthRange(minLength, maxLength)
+                            .setForFingerprint(mForFingerprint)
+                            .setUserId(mUserId);
+            if (mHasChallenge) {
+                builder.setChallenge(mChallenge);
+            } else {
+                builder.setPassword(mUserPassword);
             }
+            return builder.build();
         }
 
-        protected Intent getLockManagedPasswordIntent(boolean requirePassword, String password) {
-            return mManagedPasswordProvider.createIntent(requirePassword, password);
-        }
-
-        protected Intent getLockPasswordIntent(Context context, int quality,
-                int minLength, final int maxLength,
-                boolean requirePasswordToDecrypt, boolean confirmCredentials, int userId) {
-            return ChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, confirmCredentials, userId);
-        }
-
-        protected Intent getLockPasswordIntent(Context context, int quality,
-                int minLength, final int maxLength,
-                boolean requirePasswordToDecrypt, long challenge, int userId) {
-            return ChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, challenge, userId);
-        }
-
-        protected Intent getLockPasswordIntent(Context context, int quality, int minLength,
-                int maxLength, boolean requirePasswordToDecrypt, String password, int userId) {
-            return ChooseLockPassword.createIntent(context, quality, minLength, maxLength,
-                    requirePasswordToDecrypt, password, userId);
-        }
-
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                final boolean confirmCredentials, int userId) {
-            return ChooseLockPattern.createIntent(context, requirePassword,
-                    confirmCredentials, userId);
-        }
-
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-               long challenge, int userId) {
-            return ChooseLockPattern.createIntent(context, requirePassword, challenge, userId);
-        }
-
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                final String pattern, int userId) {
-            return ChooseLockPattern.createIntent(context, requirePassword, pattern, userId);
+        protected Intent getLockPatternIntent() {
+            ChooseLockPattern.IntentBuilder builder =
+                    new ChooseLockPattern.IntentBuilder(getContext())
+                            .setForFingerprint(mForFingerprint)
+                            .setUserId(mUserId);
+            if (mHasChallenge) {
+                builder.setChallenge(mChallenge);
+            } else {
+                builder.setPattern(mUserPassword);
+            }
+            return builder.build();
         }
 
         protected Intent getEncryptionInterstitialIntent(Context context, int quality,
@@ -648,17 +611,24 @@
          *
          * @param quality the desired quality. Ignored if DevicePolicyManager requires more security
          * @param disabled whether or not to show LockScreen at all. Only meaningful when quality is
+         * @param chooseLockSkipped whether or not this activity is skipped. This is true when this
+         * activity was not shown to the user at all, instead automatically proceeding based on
+         * the given intent extras, typically {@link LockPatternUtils#PASSWORD_TYPE_KEY}.
          * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}
          */
-        void updateUnlockMethodAndFinish(int quality, boolean disabled) {
+        void updateUnlockMethodAndFinish(int quality, boolean disabled, boolean chooseLockSkipped) {
             // Sanity check. We should never get here without confirming user's existing password.
             if (!mPasswordConfirmed) {
                 throw new IllegalStateException("Tried to update password without confirming it");
             }
 
-            quality = upgradeQuality(quality);
-            Intent intent = getIntentForUnlockMethod(quality, disabled);
+            quality = mController.upgradeQuality(quality);
+            Intent intent = getIntentForUnlockMethod(quality);
             if (intent != null) {
+                if (getIntent().getBooleanExtra(EXTRA_SHOW_OPTIONS_BUTTON, false)) {
+                    intent.putExtra(EXTRA_SHOW_OPTIONS_BUTTON, chooseLockSkipped);
+                }
+                intent.putExtra(EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS, getIntent().getExtras());
                 startActivityForResult(intent,
                         mIsSetNewPassword && mHasChallenge
                                 ? CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST
@@ -677,32 +647,19 @@
             }
         }
 
-        private Intent getIntentForUnlockMethod(int quality, boolean disabled) {
+        private Intent getIntentForUnlockMethod(int quality) {
             Intent intent = null;
-            final Context context = getActivity();
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
-                intent = getLockManagedPasswordIntent(mRequirePassword, mUserPassword);
+                intent = getLockManagedPasswordIntent(mUserPassword);
             } else if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
                 int minLength = mDPM.getPasswordMinimumLength(null, mUserId);
                 if (minLength < MIN_PASSWORD_LENGTH) {
                     minLength = MIN_PASSWORD_LENGTH;
                 }
                 final int maxLength = mDPM.getPasswordMaximumLength(quality);
-                if (mHasChallenge) {
-                    intent = getLockPasswordIntent(context, quality, minLength,
-                            maxLength, mRequirePassword, mChallenge, mUserId);
-                } else {
-                    intent = getLockPasswordIntent(context, quality, minLength,
-                            maxLength, mRequirePassword, mUserPassword, mUserId);
-                }
+                intent = getLockPasswordIntent(quality, minLength, maxLength);
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-                if (mHasChallenge) {
-                    intent = getLockPatternIntent(context, mRequirePassword,
-                            mChallenge, mUserId);
-                } else {
-                    intent = getLockPatternIntent(context, mRequirePassword,
-                            mUserPassword, mUserId);
-                }
+                intent = getLockPatternIntent();
             }
             if (intent != null) {
                 intent.putExtra(EXTRA_HIDE_DRAWER, mHideDrawer);
@@ -850,35 +807,33 @@
         }
 
         private boolean isUnlockMethodSecure(String unlockMethod) {
-            return !(KEY_UNLOCK_SET_OFF.equals(unlockMethod) ||
-                    KEY_UNLOCK_SET_NONE.equals(unlockMethod));
+            return !(ScreenLockType.SWIPE.preferenceKey.equals(unlockMethod) ||
+                    ScreenLockType.NONE.preferenceKey.equals(unlockMethod));
         }
 
         private boolean setUnlockMethod(String unlockMethod) {
             EventLog.writeEvent(EventLogTags.LOCK_SCREEN_TYPE, unlockMethod);
 
-            if (KEY_UNLOCK_SET_OFF.equals(unlockMethod)) {
-                updateUnlockMethodAndFinish(
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, true /* disabled */ );
-            } else if (KEY_UNLOCK_SET_NONE.equals(unlockMethod)) {
-                updateUnlockMethodAndFinish(
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false /* disabled */ );
-            } else if (KEY_UNLOCK_SET_MANAGED.equals(unlockMethod)) {
-                maybeEnableEncryption(DevicePolicyManager.PASSWORD_QUALITY_MANAGED, false);
-            } else if (KEY_UNLOCK_SET_PATTERN.equals(unlockMethod)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);
-            } else if (KEY_UNLOCK_SET_PIN.equals(unlockMethod)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);
-            } else if (KEY_UNLOCK_SET_PASSWORD.equals(unlockMethod)) {
-                maybeEnableEncryption(
-                        DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);
-            } else {
-                Log.e(TAG, "Encountered unknown unlock method to set: " + unlockMethod);
-                return false;
+            ScreenLockType lock = ScreenLockType.fromKey(unlockMethod);
+            if (lock != null) {
+                switch (lock) {
+                    case NONE:
+                    case SWIPE:
+                        updateUnlockMethodAndFinish(
+                                lock.defaultQuality,
+                                lock == ScreenLockType.NONE,
+                                false /* chooseLockSkipped */);
+                        return true;
+                    case PATTERN:
+                    case PIN:
+                    case PASSWORD:
+                    case MANAGED:
+                        maybeEnableEncryption(lock.defaultQuality, false);
+                        return true;
+                }
             }
-            return true;
+            Log.e(TAG, "Encountered unknown unlock method to set: " + unlockMethod);
+            return false;
         }
 
         private void showFactoryResetProtectionWarningDialog(String unlockMethodToSet) {
@@ -924,23 +879,12 @@
                         .setTitle(args.getInt(ARG_TITLE_RES))
                         .setMessage(args.getInt(ARG_MESSAGE_RES))
                         .setPositiveButton(R.string.unlock_disable_frp_warning_ok,
-                                new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int whichButton) {
-                                        ((ChooseLockGenericFragment) getParentFragment())
-                                                .setUnlockMethod(
-                                                        args.getString(ARG_UNLOCK_METHOD_TO_SET));
-                                    }
-                                }
-                        )
-                        .setNegativeButton(R.string.cancel,
-                                new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int whichButton) {
-                                        dismiss();
-                                    }
-                                }
-                        )
+                                (dialog, whichButton) -> {
+                                    String unlockMethod = args.getString(ARG_UNLOCK_METHOD_TO_SET);
+                                    ((ChooseLockGenericFragment) getParentFragment())
+                                            .setUnlockMethod(unlockMethod);
+                                })
+                        .setNegativeButton(R.string.cancel, (dialog, whichButton) -> dismiss())
                         .create();
             }
 
diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java
new file mode 100644
index 0000000..a6a1701
--- /dev/null
+++ b/src/com/android/settings/password/ChooseLockGenericController.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.password;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.os.UserHandle;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A controller for ChooseLockGeneric, and other similar classes which shows a list of possible
+ * screen locks for the user to choose from.
+ */
+public class ChooseLockGenericController {
+
+    private final Context mContext;
+    private final int mUserId;
+    private ManagedLockPasswordProvider mManagedPasswordProvider;
+    private DevicePolicyManager mDpm;
+
+    public ChooseLockGenericController(Context context, int userId) {
+        this(
+                context,
+                userId,
+                context.getSystemService(DevicePolicyManager.class),
+                ManagedLockPasswordProvider.get(context, userId));
+    }
+
+    @VisibleForTesting
+    ChooseLockGenericController(
+            Context context,
+            int userId,
+            DevicePolicyManager dpm,
+            ManagedLockPasswordProvider managedLockPasswordProvider) {
+        mContext = context;
+        mUserId = userId;
+        mManagedPasswordProvider = managedLockPasswordProvider;
+        mDpm = dpm;
+    }
+
+    /**
+     * @return The higher quality of either the specified {@code quality} or the quality required
+     *         by {@link DevicePolicyManager#getPasswordQuality}.
+     */
+    public int upgradeQuality(int quality) {
+        // Compare min allowed password quality
+        return Math.max(quality, mDpm.getPasswordQuality(null, mUserId));
+    }
+
+    /**
+     * Whether the given screen lock type should be visible in the given context.
+     */
+    public boolean isScreenLockVisible(ScreenLockType type) {
+        switch (type) {
+            case NONE:
+                return !mContext.getResources().getBoolean(R.bool.config_hide_none_security_option);
+            case SWIPE:
+                return !mContext.getResources().getBoolean(R.bool.config_hide_swipe_security_option)
+                    // Swipe doesn't make sense for profiles.
+                    && mUserId == UserHandle.myUserId();
+            case MANAGED:
+                return mManagedPasswordProvider.isManagedPasswordChoosable();
+        }
+        return true;
+    }
+
+    /**
+     * Whether screen lock with {@code type} should be enabled.
+     *
+     * @param type The screen lock type.
+     * @param quality The minimum required quality. This can either be requirement by device policy
+     *                manager or because some flow only makes sense with secure lock screens.
+     */
+    public boolean isScreenLockEnabled(ScreenLockType type, int quality) {
+        return type.maxQuality >= quality;
+    }
+
+    /**
+     * Whether screen lock with {@code type} is disabled by device policy admin.
+     *
+     * @param type The screen lock type.
+     * @param adminEnforcedQuality The minimum quality that the admin enforces.
+     */
+    public boolean isScreenLockDisabledByAdmin(ScreenLockType type, int adminEnforcedQuality) {
+        boolean disabledByAdmin = type.maxQuality < adminEnforcedQuality;
+        if (type == ScreenLockType.MANAGED) {
+            disabledByAdmin = disabledByAdmin
+                    || !mManagedPasswordProvider.isManagedPasswordChoosable();
+        }
+        return disabledByAdmin;
+    }
+
+    /**
+     * User friendly title for the given screen lock type.
+     */
+    public CharSequence getTitle(ScreenLockType type) {
+        switch (type) {
+            case NONE:
+                return mContext.getText(R.string.unlock_set_unlock_off_title);
+            case SWIPE:
+                return mContext.getText(R.string.unlock_set_unlock_none_title);
+            case PATTERN:
+                return mContext.getText(R.string.unlock_set_unlock_pattern_title);
+            case PIN:
+                return mContext.getText(R.string.unlock_set_unlock_pin_title);
+            case PASSWORD:
+                return mContext.getText(R.string.unlock_set_unlock_password_title);
+            case MANAGED:
+                return mManagedPasswordProvider.getPickerOptionTitle(false);
+        }
+        return null;
+    }
+
+    /**
+     * Gets a list of screen locks that should be visible for the given quality. The returned list
+     * is ordered in the natural order of the enum (the order those enums were defined).
+     *
+     * @param quality The minimum quality required in the context of the current flow. This should
+     *                be one of the constants defined in
+     *                {@code DevicePolicyManager#PASSWORD_QUALITY_*}.
+     * @param includeDisabled Whether to include screen locks disabled by {@code quality}
+     *                        requirements in the returned list.
+     */
+    @NonNull
+    public List<ScreenLockType> getVisibleScreenLockTypes(int quality, boolean includeDisabled) {
+        int upgradedQuality = upgradeQuality(quality);
+        List<ScreenLockType> locks = new ArrayList<>();
+        // EnumSet's iterator guarantees the natural order of the enums
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            if (isScreenLockVisible(lock)) {
+                if (includeDisabled || isScreenLockEnabled(lock, upgradedQuality)) {
+                    locks.add(lock);
+                }
+            }
+        }
+        return locks;
+    }
+}
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
similarity index 84%
rename from src/com/android/settings/ChooseLockPassword.java
rename to src/com/android/settings/password/ChooseLockPassword.java
index 351c2a2..84e150a 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.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.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.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 @@
         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 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 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 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 @@
     @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 @@
         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 @@
         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 @@
         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 @@
          */
         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 @@
             }
             // 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 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 @@
             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 @@
                         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 @@
                 mSaveAndFinishWorker.setListener(this);
             } else {
                 mPasswordEntry.requestFocus();
+                mPasswordEntry.scheduleShowSoftInput();
             }
         }
 
@@ -499,7 +538,7 @@
             // If the stage changed, announce the header for accessibility. This
             // is a no-op when accessibility is disabled.
             if (previousStage != stage) {
-                mHeaderText.announceForAccessibility(mHeaderText.getText());
+                mLayout.announceForAccessibility(mLayout.getHeaderText());
             }
         }
 
@@ -783,7 +822,7 @@
         /**
          * 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 @@
             } 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 @@
 
         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 4afeae0..9d00729 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.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 @@
         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 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(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 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 @@
     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 @@
          * 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 @@
         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 @@
                         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 @@
             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 @@
             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 6f0c453..b5a838f 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 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 @@
      * @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 @@
             @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 @@
                         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 @@
                         returnCredentials || hasChallenge
                                 ? ConfirmLockPassword.InternalActivity.class
                                 : ConfirmLockPassword.class, returnCredentials, external,
-                                hasChallenge, challenge, userId);
+                                hasChallenge, challenge, userId, alternateButton);
                 break;
         }
         return launched;
@@ -230,7 +249,7 @@
     private boolean launchConfirmationActivity(int request, CharSequence title, CharSequence header,
             CharSequence message, Class<?> activityClass, boolean returnCredentials,
             boolean external, boolean hasChallenge, long challenge,
-            int userId) {
+            int userId, @Nullable CharSequence alternateButton) {
         final Intent intent = new Intent();
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);
@@ -245,6 +264,7 @@
         // we should never have a drawer when confirming device credentials.
         intent.putExtra(SettingsActivity.EXTRA_HIDE_DRAWER, true);
         intent.putExtra(Intent.EXTRA_USER_ID, userId);
+        intent.putExtra(KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL, alternateButton);
         intent.setClassName(ConfirmDeviceCredentialBaseFragment.PACKAGE, activityClass.getName());
         if (external) {
             intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
@@ -257,8 +277,10 @@
             }
         } 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 @@
             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 0000000..13dc996
--- /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 22f1e52..65d72f1 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Activity;
 import android.app.KeyguardManager;
@@ -27,6 +27,7 @@
 import android.util.Log;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.Utils;
 
 /**
  * Launch this when you want to confirm the user is present by asking them to enter their
@@ -65,6 +66,10 @@
         Intent intent = getIntent();
         String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
         String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
+        String alternateButton = intent.getStringExtra(
+                KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
+        boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction());
+
         int userId = Utils.getCredentialOwnerUserId(this);
         if (isInternalActivity()) {
             try {
@@ -85,7 +90,9 @@
         // If the target is a managed user and user key not unlocked yet, we will force unlock
         // tied profile so it will enable work mode and unlock managed profile, when personal
         // challenge is unlocked.
-        if (isManagedProfile && isInternalActivity()
+        if (frp) {
+            launched = helper.launchFrpConfirmationActivity(0, title, details, alternateButton);
+        } else if (isManagedProfile && isInternalActivity()
                 && !lockPatternUtils.isSeparateProfileChallengeEnabled(userId)) {
             // We set the challenge as 0L, so it will force to unlock managed profile when it
             // unlocks primary profile screen lock, by calling verifyTiedProfileChallenge()
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
similarity index 95%
rename from src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
rename to src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 489dbbe..2b2b38f 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.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 @@
             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 2c97e1a..64f3a6f 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -15,7 +15,7 @@
  */
 
 // TODO (b/35202196): move this class out of the root of the package.
-package com.android.settings;
+package com.android.settings.password;
 
 import android.annotation.Nullable;
 import android.app.ActivityManager;
@@ -25,12 +25,14 @@
 import android.app.DialogFragment;
 import android.app.FragmentManager;
 import android.app.IActivityManager;
+import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
 import android.app.trust.TrustManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentSender;
+import android.content.pm.UserInfo;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
@@ -39,6 +41,7 @@
 import android.os.Handler;
 import android.os.RemoteException;
 import android.os.UserManager;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -47,6 +50,9 @@
 import android.widget.TextView;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.OptionsMenuFragment;
+import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.fingerprint.FingerprintUiHelper;
 
 /**
@@ -67,6 +73,10 @@
     public static final String SHOW_WHEN_LOCKED =
             PACKAGE + ".ConfirmCredentials.showWhenLocked";
 
+    protected static final int USER_TYPE_PRIMARY = 1;
+    protected static final int USER_TYPE_MANAGED_PROFILE = 2;
+    protected static final int USER_TYPE_SECONDARY = 3;
+
     private FingerprintUiHelper mFingerprintHelper;
     protected boolean mReturnCredentials = false;
     protected Button mCancelButton;
@@ -75,20 +85,28 @@
     protected int mUserId;
     protected UserManager mUserManager;
     protected LockPatternUtils mLockPatternUtils;
+    protected DevicePolicyManager mDevicePolicyManager;
     protected TextView mErrorTextView;
     protected final Handler mHandler = new Handler();
+    protected boolean mFrp;
+    private CharSequence mFrpAlternateButtonText;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mFrpAlternateButtonText = getActivity().getIntent().getCharSequenceExtra(
+                KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
         mReturnCredentials = getActivity().getIntent().getBooleanExtra(
                 ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false);
         // Only take this argument into account if it belongs to the current profile.
         Intent intent = getActivity().getIntent();
         mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
+        mFrp = (mUserId == LockPatternUtils.USER_FRP);
         mUserManager = UserManager.get(getActivity());
         mEffectiveUserId = mUserManager.getCredentialOwnerProfile(mUserId);
         mLockPatternUtils = new LockPatternUtils(getActivity());
+        mDevicePolicyManager = (DevicePolicyManager) getActivity().getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
     }
 
     @Override
@@ -101,10 +119,18 @@
                 (TextView) view.findViewById(R.id.errorText), this, mEffectiveUserId);
         boolean showCancelButton = getActivity().getIntent().getBooleanExtra(
                 SHOW_CANCEL_BUTTON, false);
-        mCancelButton.setVisibility(showCancelButton ? View.VISIBLE : View.GONE);
+        boolean hasAlternateButton = mFrp && !TextUtils.isEmpty(mFrpAlternateButtonText);
+        mCancelButton.setVisibility(showCancelButton || hasAlternateButton
+                ? View.VISIBLE : View.GONE);
+        if (hasAlternateButton) {
+            mCancelButton.setText(mFrpAlternateButtonText);
+        }
         mCancelButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (hasAlternateButton) {
+                    getActivity().setResult(KeyguardManager.RESULT_ALTERNATE);
+                }
                 getActivity().finish();
             }
         });
@@ -119,9 +145,8 @@
     }
 
     private boolean isFingerprintDisabledByAdmin() {
-        DevicePolicyManager dpm = (DevicePolicyManager) getActivity().getSystemService(
-                Context.DEVICE_POLICY_SERVICE);
-        final int disabledFeatures = dpm.getKeyguardDisabledFeatures(null, mEffectiveUserId);
+        final int disabledFeatures =
+                mDevicePolicyManager.getKeyguardDisabledFeatures(null, mEffectiveUserId);
         return (disabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0;
     }
 
@@ -129,15 +154,16 @@
     // credential. Otherwise, fingerprint can't unlock fbe/keystore through
     // verifyTiedProfileChallenge. In such case, we also wanna show the user message that
     // fingerprint is disabled due to device restart.
-    protected boolean isFingerprintDisallowedByStrongAuth() {
-        return !(mLockPatternUtils.isFingerprintAllowedForUser(mEffectiveUserId)
-                && mUserManager.isUserUnlocked(mUserId));
+    protected boolean isStrongAuthRequired() {
+        return mFrp
+                || !mLockPatternUtils.isFingerprintAllowedForUser(mEffectiveUserId)
+                || !mUserManager.isUserUnlocked(mUserId);
     }
 
     private boolean isFingerprintAllowed() {
         return !mReturnCredentials
                 && getActivity().getIntent().getBooleanExtra(ALLOW_FP_AUTHENTICATION, false)
-                && !isFingerprintDisallowedByStrongAuth()
+                && !isStrongAuthRequired()
                 && !isFingerprintDisabledByAdmin();
     }
 
@@ -155,10 +181,7 @@
                 mFingerprintHelper.stopListening();
             }
         }
-        if (isProfileChallenge()) {
-            updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                    mEffectiveUserId));
-        }
+        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
     }
 
     protected void setAccessibilityTitle(CharSequence supplementalText) {
@@ -242,9 +265,8 @@
             mainContent.setPadding(0, 0, 0, 0);
         }
 
-        DevicePolicyManager dpm = (DevicePolicyManager) getActivity().getSystemService(
-                Context.DEVICE_POLICY_SERVICE);
-        baseView.setBackground(new ColorDrawable(dpm.getOrganizationColorForUser(userId)));
+        baseView.setBackground(
+                new ColorDrawable(mDevicePolicyManager.getOrganizationColorForUser(userId)));
         ImageView imageView = (ImageView) baseView.findViewById(R.id.background_image);
         if (imageView != null) {
             Drawable image = getResources().getDrawable(R.drawable.work_challenge_background);
@@ -260,13 +282,9 @@
         }
     }
 
-    protected boolean isProfileChallenge() {
-        return mUserManager.isManagedProfile(mEffectiveUserId);
-    }
-
-    protected void reportSuccessfullAttempt() {
-        if (isProfileChallenge()) {
-            mLockPatternUtils.reportSuccessfulPasswordAttempt(mEffectiveUserId);
+    protected void reportSuccessfulAttempt() {
+        mLockPatternUtils.reportSuccessfulPasswordAttempt(mEffectiveUserId);
+        if (mUserManager.isManagedProfile(mEffectiveUserId)) {
             // Keyguard is responsible to disable StrongAuth for primary user. Disable StrongAuth
             // for work challenge only here.
             mLockPatternUtils.userPresent(mEffectiveUserId);
@@ -274,40 +292,73 @@
     }
 
     protected void reportFailedAttempt() {
-        if (isProfileChallenge()) {
-            // + 1 for this attempt.
-            updateErrorMessage(
-                    mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId) + 1);
-            mLockPatternUtils.reportFailedPasswordAttempt(mEffectiveUserId);
-        }
+        updateErrorMessage(
+                mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId) + 1);
+        mLockPatternUtils.reportFailedPasswordAttempt(mEffectiveUserId);
     }
 
     protected void updateErrorMessage(int numAttempts) {
         final int maxAttempts =
                 mLockPatternUtils.getMaximumFailedPasswordsForWipe(mEffectiveUserId);
-        if (maxAttempts > 0 && numAttempts > 0) {
-            int remainingAttempts = maxAttempts - numAttempts;
-            if (remainingAttempts == 1) {
-                // Last try
-                final String title = getActivity().getString(
-                        R.string.lock_profile_wipe_warning_title);
-                LastTryDialog.show(getFragmentManager(), title, getLastTryErrorMessage(),
-                        android.R.string.ok, false /* dismiss */);
-            } else if (remainingAttempts <= 0) {
-                // Profile is wiped
-                LastTryDialog.show(getFragmentManager(), null /* title */,
-                        R.string.lock_profile_wipe_content, R.string.lock_profile_wipe_dismiss,
-                        true /* dismiss */);
-            }
-            if (mErrorTextView != null) {
-                final String message = getActivity().getString(R.string.lock_profile_wipe_attempts,
-                        numAttempts, maxAttempts);
-                showError(message, 0);
-            }
+        if (maxAttempts <= 0 || numAttempts <= 0) {
+            return;
+        }
+
+        // Update the on-screen error string
+        if (mErrorTextView != null) {
+            final String message = getActivity().getString(
+                    R.string.lock_failed_attempts_before_wipe, numAttempts, maxAttempts);
+            showError(message, 0);
+        }
+
+        // Only show popup dialog before the last attempt and before wipe
+        final int remainingAttempts = maxAttempts - numAttempts;
+        if (remainingAttempts > 1) {
+            return;
+        }
+        final FragmentManager fragmentManager = getChildFragmentManager();
+        final int userType = getUserTypeForWipe();
+        if (remainingAttempts == 1) {
+            // Last try
+            final String title = getActivity().getString(
+                    R.string.lock_last_attempt_before_wipe_warning_title);
+            final int messageId = getLastTryErrorMessage(userType);
+            LastTryDialog.show(fragmentManager, title, messageId,
+                    android.R.string.ok, false /* dismiss */);
+        } else {
+            // Device, profile, or secondary user is wiped
+            final int messageId = getWipeMessage(userType);
+            LastTryDialog.show(fragmentManager, null /* title */, messageId,
+                    R.string.lock_failed_attempts_now_wiping_dialog_dismiss, true /* dismiss */);
         }
     }
 
-    protected abstract int getLastTryErrorMessage();
+    private int getUserTypeForWipe() {
+        final UserInfo userToBeWiped = mUserManager.getUserInfo(
+                mDevicePolicyManager.getProfileWithMinimumFailedPasswordsForWipe(mEffectiveUserId));
+        if (userToBeWiped == null || userToBeWiped.isPrimary()) {
+            return USER_TYPE_PRIMARY;
+        } else if (userToBeWiped.isManagedProfile()) {
+            return USER_TYPE_MANAGED_PROFILE;
+        } else {
+            return USER_TYPE_SECONDARY;
+        }
+    }
+
+    protected abstract int getLastTryErrorMessage(int userType);
+
+    private int getWipeMessage(int userType) {
+        switch (userType) {
+            case USER_TYPE_PRIMARY:
+                return R.string.lock_failed_attempts_now_wiping_device;
+            case USER_TYPE_MANAGED_PROFILE:
+                return R.string.lock_failed_attempts_now_wiping_profile;
+            case USER_TYPE_SECONDARY:
+                return R.string.lock_failed_attempts_now_wiping_user;
+            default:
+                throw new IllegalArgumentException("Unrecognized user type:" + userType);
+        }
+    }
 
     private final Runnable mResetErrorRunnable = new Runnable() {
         @Override
@@ -354,6 +405,7 @@
             DialogFragment dialog = new LastTryDialog();
             dialog.setArguments(args);
             dialog.show(from, TAG);
+            from.executePendingTransactions();
             return true;
         }
 
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
similarity index 89%
rename from src/com/android/settings/ConfirmLockPassword.java
rename to src/com/android/settings/password/ConfirmLockPassword.java
index 9a285f2..853ab36 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.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 @@
 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 @@
             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 @@
                     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 @@
             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 @@
         }
 
         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 @@
         }
 
         @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 @@
             } else {
                 resetState();
                 mErrorTextView.setText("");
-                if (isProfileChallenge()) {
-                    updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                            mEffectiveUserId));
-                }
+                updateErrorMessage(
+                        mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
             }
             mCredentialCheckResultTracker.setListener(this);
         }
@@ -295,7 +317,7 @@
             mPasswordEntry.setEnabled(true);
             mPasswordEntryInputDisabler.setInputEnabled(true);
             if (shouldAutoShowSoftKeyboard()) {
-                mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
+                mPasswordEntry.scheduleShowSoftInput();
             }
         }
 
@@ -438,7 +460,7 @@
             mPasswordEntryInputDisabler.setInputEnabled(true);
             if (matched) {
                 if (newResult) {
-                    reportSuccessfullAttempt();
+                    reportSuccessfulAttempt();
                 }
                 startDisappearAnimation(intent);
                 checkForPendingIntent();
@@ -487,10 +509,8 @@
                 public void onFinish() {
                     resetState();
                     mErrorTextView.setText("");
-                    if (isProfileChallenge()) {
-                        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                                mEffectiveUserId));
-                    }
+                    updateErrorMessage(
+                            mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
                 }
             }.start();
         }
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
similarity index 93%
rename from src/com/android/settings/ConfirmLockPattern.java
rename to src/com/android/settings/password/ConfirmLockPattern.java
index 56d92f1..0c0025e 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -37,6 +37,7 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
+import com.android.settings.R;
 import com.android.settingslib.animation.AppearAnimationCreator;
 import com.android.settingslib.animation.AppearAnimationUtils;
 import com.android.settingslib.animation.DisappearAnimationUtils;
@@ -153,7 +154,13 @@
                 // on first launch, if no lock pattern is set, then finish with
                 // success (don't want user to get stuck confirming something that
                 // doesn't exist).
-                if (!mLockPatternUtils.isLockPatternEnabled(mEffectiveUserId)) {
+                // Don't do this check for FRP though, because the pattern is not stored
+                // in a way that isLockPatternEnabled is aware of for that case.
+                // TODO(roosa): This block should no longer be needed since we removed the
+                //              ability to disable the pattern in L. Remove this block after
+                //              ensuring it's safe to do so. (Note that ConfirmLockPassword
+                //              doesn't have this).
+                if (!mFrp && !mLockPatternUtils.isLockPatternEnabled(mEffectiveUserId)) {
                     getActivity().setResult(Activity.RESULT_OK);
                     getActivity().finish();
                 }
@@ -236,15 +243,11 @@
         }
 
         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 @@
                         mDetailsTextView.setText(getDefaultDetails());
                     }
                     mErrorTextView.setText("");
-                    if (isProfileChallenge()) {
-                        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                                mEffectiveUserId));
-                    }
+                    updateErrorMessage(
+                            mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
 
                     mLockPatternView.setEnabled(true);
                     mLockPatternView.enableInput();
@@ -495,7 +496,7 @@
             mLockPatternView.setEnabled(true);
             if (matched) {
                 if (newResult) {
-                    reportSuccessfullAttempt();
+                    reportSuccessfulAttempt();
                 }
                 startDisappearAnimation(intent);
                 checkForPendingIntent();
@@ -522,8 +523,17 @@
         }
 
         @Override
-        protected int getLastTryErrorMessage() {
-            return R.string.lock_profile_wipe_warning_content_pattern;
+        protected int getLastTryErrorMessage(int userType) {
+            switch (userType) {
+                case USER_TYPE_PRIMARY:
+                    return R.string.lock_last_pattern_attempt_before_wipe_device;
+                case USER_TYPE_MANAGED_PROFILE:
+                    return R.string.lock_last_pattern_attempt_before_wipe_profile;
+                case USER_TYPE_SECONDARY:
+                    return R.string.lock_last_pattern_attempt_before_wipe_user;
+                default:
+                    throw new IllegalArgumentException("Unrecognized user type:" + userType);
+            }
         }
 
         private void handleAttemptLockout(long elapsedRealtimeDeadline) {
diff --git a/src/com/android/settings/CredentialCheckResultTracker.java b/src/com/android/settings/password/CredentialCheckResultTracker.java
similarity index 98%
rename from src/com/android/settings/CredentialCheckResultTracker.java
rename to src/com/android/settings/password/CredentialCheckResultTracker.java
index cfd6f29..a17939c 100644
--- a/src/com/android/settings/CredentialCheckResultTracker.java
+++ b/src/com/android/settings/password/CredentialCheckResultTracker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Fragment;
 import android.content.Intent;
diff --git a/src/com/android/settings/ManagedLockPasswordProvider.java b/src/com/android/settings/password/ManagedLockPasswordProvider.java
similarity index 90%
rename from src/com/android/settings/ManagedLockPasswordProvider.java
rename to src/com/android/settings/password/ManagedLockPasswordProvider.java
index b9725d7..09fe104 100644
--- a/src/com/android/settings/ManagedLockPasswordProvider.java
+++ b/src/com/android/settings/password/ManagedLockPasswordProvider.java
@@ -14,11 +14,13 @@
  * limitations under the License
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.content.Context;
 import android.content.Intent;
 
+import com.android.settings.R;
+
 /**
  * Helper for handling managed passwords in security settings UI.
  * It provides resources that should be shown in settings UI when lock password quality is set to
@@ -28,7 +30,7 @@
  */
 public class ManagedLockPasswordProvider {
     /** Factory method to make it easier to inject extended ManagedLockPasswordProviders. */
-    static ManagedLockPasswordProvider get(Context context, int userId) {
+    public static ManagedLockPasswordProvider get(Context context, int userId) {
         return new ManagedLockPasswordProvider();
     }
 
@@ -50,7 +52,7 @@
      * Should be overridden if {@link #isManagedPasswordSupported()} returns true.
      * @param forFingerprint Whether fingerprint unlock is enabled.
      */
-    String getPickerOptionTitle(boolean forFingerprint) { return ""; }
+    CharSequence getPickerOptionTitle(boolean forFingerprint) { return ""; }
 
     /**
      * Gets resource id of the lock screen preference that should be displayed in security settings
@@ -58,7 +60,7 @@
      * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED}.
      * @param forProfile Whether the settings are shown for a user profile rather than a user.
      */
-    int getResIdForLockUnlockScreen(boolean forProfile) {
+    public int getResIdForLockUnlockScreen(boolean forProfile) {
         return forProfile ? R.xml.security_settings_password_profile
                 : R.xml.security_settings_password;
     }
@@ -68,7 +70,7 @@
      * screen preference in security settings if the current password quality is set to
      * {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_MANAGED}.
      */
-    int getResIdForLockUnlockSubScreen() {
+    public int getResIdForLockUnlockSubScreen() {
         return R.xml.security_settings_password_sub;
     }
 
diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java
index b05d8b8..5fcd8a9 100644
--- a/src/com/android/settings/password/PasswordRequirementAdapter.java
+++ b/src/com/android/settings/password/PasswordRequirementAdapter.java
@@ -23,12 +23,10 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-
-import static com.android.settings.password.PasswordRequirementAdapter
-        .PasswordRequirementViewHolder;
+import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirementViewHolder;
 
 /**
- * Used in {@link com.android.settings.ChooseLockPassword} to show password requirements.
+ * Used in {@link ChooseLockPassword} to show password requirements.
  */
 public class PasswordRequirementAdapter extends
         RecyclerView.Adapter<PasswordRequirementViewHolder> {
diff --git a/src/com/android/settings/SaveChosenLockWorkerBase.java b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
similarity index 98%
rename from src/com/android/settings/SaveChosenLockWorkerBase.java
rename to src/com/android/settings/password/SaveChosenLockWorkerBase.java
index 7ce7a90..95980e9 100644
--- a/src/com/android/settings/SaveChosenLockWorkerBase.java
+++ b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Fragment;
 import android.content.Context;
diff --git a/src/com/android/settings/password/ScreenLockType.java b/src/com/android/settings/password/ScreenLockType.java
new file mode 100644
index 0000000..608c8f6
--- /dev/null
+++ b/src/com/android/settings/password/ScreenLockType.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.password;
+
+import android.app.admin.DevicePolicyManager;
+
+/**
+ * List of screen lock type options that are available in ChooseLockGeneric. Provides the key and
+ * the associated quality, and also some helper functions to translate between them.
+ */
+public enum ScreenLockType {
+
+    NONE(
+            DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
+            "unlock_set_off"),
+    SWIPE(
+            DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
+            "unlock_set_none"),
+    PATTERN(
+            DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
+            "unlock_set_pattern"),
+    PIN(
+            DevicePolicyManager.PASSWORD_QUALITY_NUMERIC,
+            DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX,
+            "unlock_set_pin"),
+    PASSWORD(
+            DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC,
+            DevicePolicyManager.PASSWORD_QUALITY_COMPLEX,
+            "unlock_set_password"),
+    MANAGED(
+            DevicePolicyManager.PASSWORD_QUALITY_MANAGED,
+            "unlock_set_managed");
+
+    private static final ScreenLockType MIN_QUALITY = ScreenLockType.NONE;
+    private static final ScreenLockType MAX_QUALITY = ScreenLockType.MANAGED;
+
+    /**
+     * The default quality of the type of lock used. For example, in the case of PIN, the default
+     * quality if PASSWORD_QUALITY_NUMERIC, while the highest quality is
+     * PASSWORD_QUALITY_NUMERIC_COMPLEX.
+     */
+    public final int defaultQuality;
+
+    /**
+     * The highest quality for the given type of lock. For example, in the case of password, the
+     * default quality is PASSWORD_QUALITY_ALPHABETIC, but the highest possible quality is
+     * PASSWORD_QUALITY_COMPLEX.
+     */
+    public final int maxQuality;
+
+    public final String preferenceKey;
+
+    ScreenLockType(int quality, String preferenceKey) {
+        this(quality, quality, preferenceKey);
+    }
+
+    ScreenLockType(int defaultQuality, int maxQuality, String preferenceKey) {
+        this.defaultQuality = defaultQuality;
+        this.maxQuality = maxQuality;
+        this.preferenceKey = preferenceKey;
+    }
+
+    /**
+     * Gets the screen lock type for the given quality. Note that this method assumes that a screen
+     * lock is enabled, which means if the quality is
+     * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}, the returned type will be
+     * {@link #SWIPE} and not {@link #NONE}.
+     */
+    public static ScreenLockType fromQuality(int quality) {
+        switch (quality) {
+            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
+                return ScreenLockType.PATTERN;
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
+                return ScreenLockType.PIN;
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
+            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
+                return ScreenLockType.PASSWORD;
+            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
+                return ScreenLockType.MANAGED;
+            case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED:
+                return ScreenLockType.SWIPE;
+        }
+        return null;
+    }
+
+    public static ScreenLockType fromKey(String key) {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            if (lock.preferenceKey.equals(key)) {
+                return lock;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java
index 4692609..99f67cb 100644
--- a/src/com/android/settings/password/SetNewPasswordActivity.java
+++ b/src/com/android/settings/password/SetNewPasswordActivity.java
@@ -25,8 +25,6 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.SetupChooseLockGeneric;
 import com.android.settings.Utils;
 
 /**
diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java
index 9443541..57aa8c1 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -19,6 +19,7 @@
 import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;
 import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
+
 import static com.android.internal.util.Preconditions.checkNotNull;
 
 import android.annotation.Nullable;
@@ -34,8 +35,6 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.Utils;
 
 /**
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
similarity index 69%
rename from src/com/android/settings/SetupChooseLockGeneric.java
rename to src/com/android/settings/password/SetupChooseLockGeneric.java
index 2c8195d..179bd79 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.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 @@
 
         @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 @@
         }
 
         @Override
-        protected Intent getLockPasswordIntent(Context context, int quality,
-                int minLength, final int maxLength,
-                boolean requirePasswordToDecrypt, boolean confirmCredentials, int userId) {
-            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, confirmCredentials);
+        protected Intent getLockPasswordIntent(int quality, int minLength, int maxLength) {
+            final Intent intent = SetupChooseLockPassword.modifyIntentForSetup(
+                    getContext(), super.getLockPasswordIntent(quality, minLength, maxLength));
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
 
         @Override
-        protected Intent getLockPasswordIntent(Context context, int quality,
-                int minLength, final int maxLength,
-                boolean requirePasswordToDecrypt, long challenge, int userId) {
-            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, challenge);
-            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
-            return intent;
-        }
-
-        @Override
-        protected Intent getLockPasswordIntent(Context context, int quality, int minLength,
-                int maxLength, boolean requirePasswordToDecrypt, String password, int userId) {
-            final Intent intent = SetupChooseLockPassword.createIntent(context, quality, minLength,
-                    maxLength, requirePasswordToDecrypt, password);
-            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
-            return intent;
-        }
-
-        @Override
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                final boolean confirmCredentials, int userId) {
-            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
-                    confirmCredentials);
-            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
-            return intent;
-        }
-
-        @Override
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                long challenge, int userId) {
-            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
-                    challenge);
-            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
-            return intent;
-        }
-
-        @Override
-        protected Intent getLockPatternIntent(Context context, final boolean requirePassword,
-                final String pattern, int userId) {
-            final Intent intent = SetupChooseLockPattern.createIntent(context, requirePassword,
-                    pattern);
+        protected Intent getLockPatternIntent() {
+            final Intent intent = SetupChooseLockPattern.modifyIntentForSetup(
+                    getContext(), super.getLockPatternIntent());
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java
new file mode 100644
index 0000000..2988f52
--- /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/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java
new file mode 100644
index 0000000..b1e3d0d
--- /dev/null
+++ b/src/com/android/settings/password/SetupChooseLockPattern.java
@@ -0,0 +1,59 @@
+/*
+ * 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.Fragment;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settings.SetupRedactionInterstitial;
+
+/**
+ * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
+ * from ChooseLockPattern 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 ChooseLockPattern class instead and let this class inherit
+ * those changes.
+ */
+public class SetupChooseLockPattern extends ChooseLockPattern {
+
+    public static Intent modifyIntentForSetup(Context context, Intent chooseLockPatternIntent) {
+        chooseLockPatternIntent.setClass(context, SetupChooseLockPattern.class);
+        return chooseLockPatternIntent;
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return SetupChooseLockPatternFragment.class.getName().equals(fragmentName);
+    }
+
+    @Override
+    /* package */ Class<? extends Fragment> getFragmentClass() {
+        return SetupChooseLockPatternFragment.class;
+    }
+
+    public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
+
+        @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/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 842e69c..36646b7 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 @@
 
     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 a1c1660..26e760c 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -164,8 +164,7 @@
     /**
      * Adds preferences for all print services to the {@value PRINT_SERVICES_CATEGORY} cathegory.
      */
-    private final class PrintServicesController implements
-           LoaderCallbacks<List<PrintServiceInfo>> {
+    private final class PrintServicesController implements LoaderCallbacks<List<PrintServiceInfo>> {
         @Override
         public Loader<List<PrintServiceInfo>> onCreateLoader(int id, Bundle args) {
             PrintManager printManager =
@@ -290,7 +289,7 @@
         }
     }
 
-     private final class PrintJobsController implements LoaderCallbacks<List<PrintJobInfo>> {
+    private final class PrintJobsController implements LoaderCallbacks<List<PrintJobInfo>> {
 
         @Override
         public Loader<List<PrintJobInfo>> onCreateLoader(int id, Bundle args) {
@@ -326,7 +325,7 @@
 
                     switch (printJob.getState()) {
                         case PrintJobInfo.STATE_QUEUED:
-                        case PrintJobInfo.STATE_STARTED: {
+                        case PrintJobInfo.STATE_STARTED:
                             if (!printJob.isCancelling()) {
                                 preference.setTitle(getString(
                                         R.string.print_printing_state_title_template,
@@ -336,15 +335,13 @@
                                         R.string.print_cancelling_state_title_template,
                                         printJob.getLabel()));
                             }
-                        } break;
-
-                        case PrintJobInfo.STATE_FAILED: {
+                            break;
+                        case PrintJobInfo.STATE_FAILED:
                             preference.setTitle(getString(
                                     R.string.print_failed_state_title_template,
                                     printJob.getLabel()));
-                        } break;
-
-                        case PrintJobInfo.STATE_BLOCKED: {
+                            break;
+                        case PrintJobInfo.STATE_BLOCKED:
                             if (!printJob.isCancelling()) {
                                 preference.setTitle(getString(
                                         R.string.print_blocked_state_title_template,
@@ -354,7 +351,7 @@
                                         R.string.print_cancelling_state_title_template,
                                         printJob.getLabel()));
                             }
-                        } break;
+                            break;
                     }
 
                     preference.setSummary(getString(R.string.print_job_summary,
@@ -364,14 +361,13 @@
 
                     switch (printJob.getState()) {
                         case PrintJobInfo.STATE_QUEUED:
-                        case PrintJobInfo.STATE_STARTED: {
+                        case PrintJobInfo.STATE_STARTED:
                             preference.setIcon(R.drawable.ic_print);
-                        } break;
-
+                            break;
                         case PrintJobInfo.STATE_FAILED:
-                        case PrintJobInfo.STATE_BLOCKED: {
+                        case PrintJobInfo.STATE_BLOCKED:
                             preference.setIcon(R.drawable.ic_print_error);
-                        } break;
+                            break;
                     }
 
                     Bundle extras = preference.getExtras();
@@ -475,7 +471,7 @@
                 PrintJobInfo printJob = printJobs.get(i).getInfo();
                 if (shouldShowToUser(printJob)) {
                     if (printJobInfos == null) {
-                        printJobInfos = new ArrayList<PrintJobInfo>();
+                        printJobInfos = new ArrayList<>();
                     }
                     printJobInfos.add(printJob);
                 }
@@ -505,8 +501,9 @@
     /**
      * Provider for the print settings summary
      */
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    static class PrintSummaryProvider implements SummaryLoader.SummaryProvider {
+    @VisibleForTesting
+    static class PrintSummaryProvider
+            implements SummaryLoader.SummaryProvider, PrintJobStateChangeListener {
         private final Context mContext;
         private final PrintManagerWrapper mPrintManager;
         private final SummaryLoader mSummaryLoader;
@@ -528,19 +525,43 @@
         public void setListening(boolean isListening) {
             if (mPrintManager != null) {
                 if (isListening) {
-                    List<PrintServiceInfo> services =
-                            mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
-                    if (services == null || services.isEmpty()) {
-                        mSummaryLoader.setSummary(this,
-                                mContext.getString(R.string.print_settings_summary_no_service));
-                    } else {
-                        final int count = services.size();
-                        mSummaryLoader.setSummary(this,
-                                mContext.getResources().getQuantityString(
-                                        R.plurals.print_settings_summary, count, count));
+                    mPrintManager.addPrintJobStateChanegListner(this);
+                    onPrintJobStateChanged(null);
+                } else {
+                    mPrintManager.removePrintJobStateChangeListener(this);
+                }
+            }
+        }
+
+        @Override
+        public void onPrintJobStateChanged(PrintJobId printJobId) {
+            final List<PrintJob> printJobs = mPrintManager.getPrintJobs();
+
+            int numActivePrintJobs = 0;
+            if (printJobs != null) {
+                for (PrintJob job : printJobs) {
+                    if (shouldShowToUser(job.getInfo())) {
+                        numActivePrintJobs++;
                     }
                 }
             }
+
+            if (numActivePrintJobs > 0) {
+                mSummaryLoader.setSummary(this, mContext.getResources().getQuantityString(
+                        R.plurals.print_jobs_summary, numActivePrintJobs, numActivePrintJobs));
+            } else {
+                List<PrintServiceInfo> services =
+                        mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
+                if (services == null || services.isEmpty()) {
+                    mSummaryLoader.setSummary(this,
+                            mContext.getString(R.string.print_settings_summary_no_service));
+                } else {
+                    final int count = services.size();
+                    mSummaryLoader.setSummary(this,
+                            mContext.getResources().getQuantityString(
+                                    R.plurals.print_settings_summary, count, count));
+                }
+            }
         }
 
         static class PrintManagerWrapper {
@@ -555,6 +576,18 @@
             public List<PrintServiceInfo> getPrintServices(int selectionFlags) {
                 return mPrintManager.getPrintServices(selectionFlags);
             }
+
+            public void addPrintJobStateChanegListner(PrintJobStateChangeListener listener) {
+                mPrintManager.addPrintJobStateChangeListener(listener);
+            }
+
+            public void removePrintJobStateChangeListener(PrintJobStateChangeListener listener) {
+                mPrintManager.removePrintJobStateChangeListener(listener);
+            }
+
+            public List<PrintJob> getPrintJobs() {
+                return mPrintManager.getPrintJobs();
+            }
         }
     }
 
diff --git a/src/com/android/settings/search2/AppSearchResult.java b/src/com/android/settings/search/AppSearchResult.java
similarity index 97%
rename from src/com/android/settings/search2/AppSearchResult.java
rename to src/com/android/settings/search/AppSearchResult.java
index eeccb82..b59e32e 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 f5e06ca..239de15 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 @@
 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 @@
         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/search/CursorToSearchResultConverter.java b/src/com/android/settings/search/CursorToSearchResultConverter.java
new file mode 100644
index 0000000..ce64de9
--- /dev/null
+++ b/src/com/android/settings/search/CursorToSearchResultConverter.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.search;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.os.BadParcelableException;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.dashboard.SiteMapManager;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.android.settings.search.DatabaseResultLoader.BASE_RANKS;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_CLASS_NAME;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_ICON;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_ID;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_KEY;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD_TYPE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_SCREEN_TITLE;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_SUMMARY_ON;
+import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_TITLE;
+import static com.android.settings.search.SearchResult.TOP_RANK;
+
+/**
+ * Controller to Build search results from {@link Cursor} Objects.
+ *
+ * Each converted {@link Cursor} has the following fields:
+ * - String Title
+ * - String Summary
+ * - int rank
+ * - {@link Drawable} icon
+ * - {@link ResultPayload} payload
+ */
+public class CursorToSearchResultConverter {
+
+    private static final String TAG = "CursorConverter";
+
+    private final Context mContext;
+
+    private final int LONG_TITLE_LENGTH = 20;
+
+    private static final String[] whiteList = {
+            "main_toggle_wifi",
+            "main_toggle_bluetooth",
+            "main_toggle_bluetooth_obsolete",
+            "toggle_airplane",
+            "tether_settings",
+            "battery_saver",
+            "toggle_nfc",
+            "restrict_background",
+            "data_usage_enable",
+            "button_roaming_key",
+    };
+    private static final Set<String> prioritySettings = new HashSet(Arrays.asList(whiteList));
+
+
+    public CursorToSearchResultConverter(Context context) {
+        mContext = context;
+    }
+
+    public Set<SearchResult> convertCursor(SiteMapManager sitemapManager,
+            Cursor cursorResults, int baseRank) {
+        if (cursorResults == null) {
+            return null;
+        }
+        final Map<String, Context> contextMap = new HashMap<>();
+        final Set<SearchResult> results = new HashSet<>();
+
+        while (cursorResults.moveToNext()) {
+            SearchResult result = buildSingleSearchResultFromCursor(sitemapManager,
+                    contextMap, cursorResults, baseRank);
+            if (result != null) {
+                results.add(result);
+            }
+        }
+        return results;
+    }
+
+    public static ResultPayload getUnmarshalledPayload(byte[] marshalledPayload,
+            int payloadType) {
+        try {
+            switch (payloadType) {
+                case ResultPayload.PayloadType.INTENT:
+                    return ResultPayloadUtils.unmarshall(marshalledPayload,
+                            ResultPayload.CREATOR);
+                case ResultPayload.PayloadType.INLINE_SWITCH:
+                    return ResultPayloadUtils.unmarshall(marshalledPayload,
+                            InlineSwitchPayload.CREATOR);
+                case ResultPayload.PayloadType.INLINE_LIST:
+                    return ResultPayloadUtils.unmarshall(marshalledPayload,
+                            InlineListPayload.CREATOR);
+            }
+        } catch (BadParcelableException e) {
+            Log.w(TAG, "Error creating parcelable: " + e);
+        }
+        return null;
+    }
+
+    private SearchResult buildSingleSearchResultFromCursor(SiteMapManager sitemapManager,
+            Map<String, Context> contextMap, Cursor cursor, int baseRank) {
+        final int docId = cursor.getInt(COLUMN_INDEX_ID);
+        final String pkgName = cursor.getString(COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE);
+        final String title = cursor.getString(COLUMN_INDEX_TITLE);
+        final String summaryOn = cursor.getString(COLUMN_INDEX_SUMMARY_ON);
+        final String className = cursor.getString(COLUMN_INDEX_CLASS_NAME);
+        final String key = cursor.getString(COLUMN_INDEX_KEY);
+        final String iconResStr = cursor.getString(COLUMN_INDEX_ICON);
+        final int payloadType = cursor.getInt(COLUMN_INDEX_PAYLOAD_TYPE);
+        final byte[] marshalledPayload = cursor.getBlob(COLUMN_INDEX_PAYLOAD);
+        final ResultPayload payload = getUnmarshalledPayload(marshalledPayload, payloadType);
+
+        final List<String> breadcrumbs = getBreadcrumbs(sitemapManager, cursor);
+        final int rank = getRank(title, baseRank, key);
+
+        final SearchResult.Builder builder = new SearchResult.Builder()
+                .setStableId(docId)
+                .setTitle(title)
+                .setSummary(summaryOn)
+                .addBreadcrumbs(breadcrumbs)
+                .setRank(rank)
+                .setIcon(getIconForPackage(contextMap, pkgName, className, iconResStr))
+                .setPayload(payload);
+        return builder.build();
+    }
+
+    private Drawable getIconForPackage(Map<String, Context> contextMap, String pkgName,
+            String className, String iconResStr) {
+        final int iconId = TextUtils.isEmpty(iconResStr)
+                ? 0 : Integer.parseInt(iconResStr);
+        Drawable icon;
+        Context packageContext;
+        if (iconId == 0) {
+            icon = null;
+        } else {
+            if (TextUtils.isEmpty(className) && !TextUtils.isEmpty(pkgName)) {
+                packageContext = contextMap.get(pkgName);
+                if (packageContext == null) {
+                    try {
+                        packageContext = mContext.createPackageContext(pkgName, 0);
+                    } catch (PackageManager.NameNotFoundException e) {
+                        Log.e(TAG, "Cannot create Context for package: " + pkgName);
+                        return null;
+                    }
+                    contextMap.put(pkgName, packageContext);
+                }
+            } else {
+                packageContext = mContext;
+            }
+            try {
+                icon = packageContext.getDrawable(iconId);
+            } catch (Resources.NotFoundException nfe) {
+                icon = null;
+            }
+        }
+        return icon;
+    }
+
+    private List<String> getBreadcrumbs(SiteMapManager siteMapManager, Cursor cursor) {
+        final String screenTitle = cursor.getString(COLUMN_INDEX_SCREEN_TITLE);
+        final String screenClass = cursor.getString(COLUMN_INDEX_CLASS_NAME);
+        return siteMapManager == null ? null : siteMapManager.buildBreadCrumb(mContext, screenClass,
+                screenTitle);
+    }
+
+    /** Uses the breadcrumbs to determine the offset to the base rank.
+     *  There are three checks
+     *  A) If the result is prioritized and the highest base level
+     *  B) If the query matches the highest level menu title
+     *  C) If the query is longer than 20
+     *
+     *  If the query matches A, set it to TOP_RANK
+     *  If the query matches B, the offset is 0.
+     *  If the query matches C, the offset is 1
+
+     * @param title of the result.
+     * @param baseRank of the result. Lower if it's a better result.
+     * @return
+     */
+    private int getRank(String title, int baseRank, String key) {
+        // The result can only be prioritized if it is a top ranked result.
+        if (prioritySettings.contains(key) && baseRank < BASE_RANKS[1]) {
+            return TOP_RANK;
+        }
+        if (title.length() > LONG_TITLE_LENGTH) {
+            return baseRank + 1;
+        }
+        return baseRank;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/search2/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java
similarity index 90%
rename from src/com/android/settings/search2/DatabaseIndexingManager.java
rename to src/com/android/settings/search/DatabaseIndexingManager.java
index 647219b..d2b2d23 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.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_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.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 @@
 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 @@
      * 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 @@
 
         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 @@
         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 @@
                 .setIntentAction(raw.intentAction)
                 .setIntentTargetPackage(raw.intentTargetPackage)
                 .setIntentTargetClass(raw.intentTargetClass)
-                .setEnabled(raw.enabled)
+                .setEnabled(enabled)
                 .setKey(raw.key)
                 .setUserId(raw.userId);
 
@@ -811,6 +807,7 @@
                         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 @@
             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 @@
                         .setClassName(className)
                         .setScreenTitle(raw.screenTitle)
                         .setIconResId(raw.iconResId)
-                        .setRank(rank)
                         .setIntentAction(raw.intentAction)
                         .setIntentTargetPackage(raw.intentTargetPackage)
                         .setIntentTargetClass(raw.intentTargetClass)
@@ -906,7 +903,15 @@
                     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 @@
                 .setNormalizedSummaryOff(normalizedSummaryOff)
                 .setSpaceDelimitedKeywords(spaceDelimitedKeywords);
 
-        updateOneRow(database, builder.build());
+        updateOneRow(database, builder.build(mContext));
     }
 
     private void updateOneRow(SQLiteDatabase database, DatabaseRow row) {
@@ -1069,10 +1074,11 @@
          * Returns the doc id for this row.
          */
         public int getDocId() {
-            // The DocID should contains more than the title string itself (you may have two
-            // settings with the same title). So we need to use a combination of multiple
-            // attributes from this row.
-            return Objects.hash(updatedTitle, screenTitle, key, payloadType);
+            // Eventually we want all DocIds to be the data_reference key. For settings values,
+            // this will be preference keys, and for non-settings they should be unique.
+            return TextUtils.isEmpty(key)
+                    ? Objects.hash(updatedTitle, className, screenTitle, intentTargetClass)
+                    : key.hashCode();
         }
 
         public static class Builder {
@@ -1220,7 +1226,49 @@
                 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 @@
 
         @VisibleForTesting
         IndexingCallback mCallback;
+        private long mIndexStartTime;
 
         public IndexingTask(IndexingCallback callback) {
             mCallback = callback;
@@ -1237,6 +1286,7 @@
 
         @Override
         protected void onPreExecute() {
+            mIndexStartTime = System.currentTimeMillis();
             mIsIndexingComplete.set(false);
         }
 
@@ -1248,10 +1298,14 @@
 
         @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 bd06ef3..40ba7ee 100644
--- a/src/com/android/settings/search2/DatabaseIndexingUtils.java
+++ b/src/com/android/settings/search/DatabaseIndexingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,21 +15,25 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.Manifest;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
 
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.search.Indexable;
 
 import java.lang.reflect.Field;
 import java.text.Normalizer;
@@ -58,6 +62,18 @@
             = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
 
     /**
+     * Builds intent into a subsetting.
+     */
+    public static Intent buildSubsettingIntent(Context context, String className, String key,
+            String screenTitle) {
+        final Bundle args = new Bundle();
+        args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
+        return Utils.onBuildStartFragmentIntent(context,
+                className, args, null, 0, screenTitle, false,
+                MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
+    }
+
+    /**
      * @param className which wil provide the map between from {@link Uri}s to
      * {@link PreferenceController}
      * @param context
@@ -158,7 +174,7 @@
      * - 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,7 +197,22 @@
         return isPrivilegedPackage(packageName, context);
     }
 
-    public static boolean isPrivilegedPackage(String packageName, Context context) {
+    static String normalizeHyphen(String input) {
+        return (input != null) ? input.replaceAll(NON_BREAKING_HYPHEN, HYPHEN) : EMPTY;
+    }
+
+    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();
+    }
+
+    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);
@@ -191,19 +222,4 @@
             return false;
         }
     }
-
-    public static String normalizeHyphen(String input) {
-        return (input != null) ? input.replaceAll(NON_BREAKING_HYPHEN, HYPHEN) : EMPTY;
-    }
-
-    public 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) {
-        return (input != null) ? input.replaceAll(LIST_DELIMITERS, SPACE) : EMPTY;
-    }
 }
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 70cefe5..73b383b 100644
--- a/src/com/android/settings/search2/DatabaseResultLoader.java
+++ b/src/com/android/settings/search/DatabaseResultLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,23 +12,21 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-
 import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
+
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.utils.AsyncLoader;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns;
 import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
@@ -36,7 +34,7 @@
 /**
  * AsyncTask to retrieve Settings, First party app and any intent based results.
  */
-public class DatabaseResultLoader extends AsyncLoader<List<? extends SearchResult>> {
+public class DatabaseResultLoader extends AsyncLoader<Set<? extends SearchResult>> {
     private static final String LOG = "DatabaseResultLoader";
 
     /* These indices are used to match the columns of the this loader's SELECT statement.
@@ -99,7 +97,8 @@
      */
     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 @@
         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;
+        final Set<SearchResult> results = new HashSet<>();
 
-        primaryFirstWordResults = firstWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[0]);
-        primaryMidWordResults = secondaryWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[1]);
-        secondaryResults = anyWordQuery(MATCH_COLUMNS_SECONDARY, BASE_RANKS[2]);
-        tertiaryResults = anyWordQuery(MATCH_COLUMNS_TERTIARY, BASE_RANKS[3]);
-
-        final List<SearchResult> results = new ArrayList<>(
-                primaryFirstWordResults.size()
-                + primaryMidWordResults.size()
-                + secondaryResults.size()
-                + tertiaryResults.size());
-
-        results.addAll(primaryFirstWordResults);
-        results.addAll(primaryMidWordResults);
-        results.addAll(secondaryResults);
-        results.addAll(tertiaryResults);
-
-        return removeDuplicates(results);
+        results.addAll(firstWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[0]));
+        results.addAll(secondaryWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[1]));
+        results.addAll(anyWordQuery(MATCH_COLUMNS_SECONDARY, BASE_RANKS[2]));
+        results.addAll(anyWordQuery(MATCH_COLUMNS_TERTIARY, BASE_RANKS[3]));
+        return results;
     }
 
     @Override
@@ -154,25 +138,13 @@
     }
 
     /**
-     * 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 @@
      *
      * @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 @@
      *
      * @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 @@
      * @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 @@
         }
         return selection;
     }
-
-    /**
-     * Goes through the list of search results and verifies that none of the results are duplicates.
-     * A duplicate is quantified by a result with the same Title and the same non-empty Summary.
-     *
-     * The method walks through the results starting with the highest priority result. It removes
-     * the duplicates by doing the first rule that applies below:
-     * - If a result is inline, remove the intent result.
-     * - Remove the lower rank item.
-     * @param results A list of results with potential duplicates
-     * @return The list of results with duplicates removed.
-     */
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    List<SearchResult> removeDuplicates(List<SearchResult> results) {
-        SearchResult primaryResult, secondaryResult;
-
-        // We accept the O(n^2) solution because the number of results is small.
-        for (int i = results.size() - 1; i >= 0; i--) {
-            secondaryResult = results.get(i);
-
-            for (int j = i - 1; j >= 0; j--) {
-                primaryResult = results.get(j);
-                if (areDuplicateResults(primaryResult, secondaryResult)) {
-                    if (primaryResult.viewType != ResultPayload.PayloadType.INTENT) {
-                        // Case where both payloads are inline
-                        results.remove(i);
-                        break;
-                    } else if (secondaryResult.viewType != ResultPayload.PayloadType.INTENT) {
-                        // Case where only second result is inline.
-                        results.remove(j);
-                        i--; // shift the top index to reflect the lower element being removed
-                    } else {
-                        // Case where both payloads are intent.
-                        results.remove(i);
-                        break;
-                    }
-                }
-            }
-        }
-        return results;
-    }
-
-    /**
-     * @return True when the two {@link SearchResult SearchResults} have the same title, and the same
-     * non-empty summary.
-     */
-    private boolean areDuplicateResults(SearchResult primary, SearchResult secondary) {
-        return TextUtils.equals(primary.title, secondary.title)
-                && TextUtils.equals(primary.summary, secondary.summary)
-                && !TextUtils.isEmpty(primary.summary);
-    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
index bb9f5ad..0758387 100644
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
@@ -54,7 +54,6 @@
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.print.PrintSettingsFragment;
-import com.android.settings.search2.DatabaseIndexingManager;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index 76346ec..d78b611 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 @@
 
     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 @@
         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);
     }
 
-    public static void setLocaleIndexed(Context context, String locale) {
-        context.getSharedPreferences(INDEX, 0).edit().putBoolean(locale, true).commit();
+    @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();
     }
 
-    public static boolean isLocaleAlreadyIndexed(Context context, String locale) {
-        return context.getSharedPreferences(INDEX, 0).getBoolean(locale, false);
+    static void clearCachedIndexed(Context context) {
+        context.getSharedPreferences(INDEX, Context.MODE_PRIVATE).edit().clear().commit();
     }
 
-    public static boolean isBuildIndexed(Context context, String buildNo) {
-        return context.getSharedPreferences(INDEX, 0).getBoolean(buildNo, false);
+    static void setLocaleIndexed(Context context, String locale) {
+        context.getSharedPreferences(INDEX, Context.MODE_PRIVATE)
+                .edit()
+                .putBoolean(locale, true)
+                .apply();
     }
 
-    public static void setBuildIndexed(Context context, String buildNo) {
+    static void setProvidersIndexed(Context context, String providerVersionedNames) {
+        context.getSharedPreferences(INDEX, Context.MODE_PRIVATE)
+                .edit()
+                .putString(PREF_KEY_INDEXED_PROVIDERS, providerVersionedNames)
+                .apply();
+    }
+
+    static boolean isLocaleAlreadyIndexed(Context context, String locale) {
+        return context.getSharedPreferences(INDEX, Context.MODE_PRIVATE).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);
+    }
+
+    static boolean isBuildIndexed(Context context, String buildNo) {
+        return context.getSharedPreferences(INDEX, Context.MODE_PRIVATE).getBoolean(buildNo, false);
+    }
+
+    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 0000000..c11c4a3
--- /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 0000000..03b8828
--- /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 0000000..bac0313
--- /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 d4a0ca2..bb8320d 100644
--- a/src/com/android/settings/search2/InlineSwitchViewHolder.java
+++ b/src/com/android/settings/search/InlineSwitchViewHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.util.Pair;
@@ -41,28 +41,25 @@
     }
 
     @Override
-    public void onBind(SearchFragment fragment, SearchResult result) {
+    public int getClickActionMetricName() {
+        return MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT;
+    }
+
+    @Override
+    public void onBind(SearchFragment fragment, final SearchResult result) {
         super.onBind(fragment, result);
         if (mContext == null) {
             return;
         }
         final InlineSwitchPayload payload = (InlineSwitchPayload) result.payload;
-        switchView.setChecked(payload.getSwitchValue(mContext));
+        switchView.setChecked(payload.getValue(mContext) == InlineSwitchPayload.TRUE);
         switchView.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            final Pair<Integer, Object> name = Pair.create(
-                    MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_NAME, payload.settingsUri);
             final Pair<Integer, Object> value = Pair.create(
                     MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_VALUE, isChecked
-                            ? "checked"
-                            : "not-checked");
-            final Pair<Integer, Object> rank = Pair.create(
-                    MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK, getAdapterPosition());
-            mMetricsFeatureProvider.action(mContext,
-                    MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT,
-                    name, value, rank);
-
-            fragment.onSearchResultClicked();
-            payload.setSwitchValue(mContext, isChecked);
+                            ? 1L : 0L);
+            fragment.onSearchResultClicked(this, result, value);
+            int newValue = isChecked ? InlineSwitchPayload.TRUE : InlineSwitchPayload.FALSE;
+            payload.setValue(mContext, newValue);
         });
     }
 }
diff --git a/src/com/android/settings/search2/InstalledAppResultLoader.java b/src/com/android/settings/search/InstalledAppResultLoader.java
similarity index 82%
rename from src/com/android/settings/search2/InstalledAppResultLoader.java
rename to src/com/android/settings/search/InstalledAppResultLoader.java
index 47e1f67..6340a61 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.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.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 @@
 
     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 @@
     }
 
     @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 @@
 
                 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 @@
                         | 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 @@
         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 @@
 
     /**
      * A temporary ranking scheme for installed apps.
+     *
      * @param wordDiff difference between query length and app name length.
      * @return the ranking.
      */
diff --git a/src/com/android/settings/search/IntentSearchViewHolder.java b/src/com/android/settings/search/IntentSearchViewHolder.java
new file mode 100644
index 0000000..711d08e
--- /dev/null
+++ b/src/com/android/settings/search/IntentSearchViewHolder.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.search;
+
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.UserHandle;
+import android.util.Log;
+import android.view.View;
+
+import com.android.internal.logging.nano.MetricsProto;
+
+import java.util.List;
+
+/**
+ * ViewHolder for intent based search results.
+ * The DatabaseResultLoader is the primary use case for this ViewHolder.
+ */
+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(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 {
+                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 0000000..6108569
--- /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 41d15e2..2c908c1 100644
--- a/src/com/android/settings/search2/ResultPayloadUtils.java
+++ b/src/com/android/settings/search/ResultPayloadUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,10 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
-import android.os.BadParcelableException;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Log;
-
-import java.io.StreamCorruptedException;
 
 /**
  * Utility class to Marshall and Unmarshall the payloads stored in the SQLite Database
diff --git a/src/com/android/settings/search2/SavedQueryController.java b/src/com/android/settings/search/SavedQueryController.java
similarity index 98%
rename from src/com/android/settings/search2/SavedQueryController.java
rename to src/com/android/settings/search/SavedQueryController.java
index 92ca42a..f6a3ff6 100644
--- a/src/com/android/settings/search2/SavedQueryController.java
+++ b/src/com/android/settings/search/SavedQueryController.java
@@ -12,9 +12,10 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.app.LoaderManager;
 import android.content.Context;
diff --git a/src/com/android/settings/search2/SavedQueryLoader.java b/src/com/android/settings/search/SavedQueryLoader.java
similarity index 93%
rename from src/com/android/settings/search2/SavedQueryLoader.java
rename to src/com/android/settings/search/SavedQueryLoader.java
index 245842c..87457f5 100644
--- a/src/com/android/settings/search2/SavedQueryLoader.java
+++ b/src/com/android/settings/search/SavedQueryLoader.java
@@ -12,16 +12,16 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.VisibleForTesting;
 
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.search.IndexDatabaseHelper.SavedQueriesColumns;
 import com.android.settings.utils.AsyncLoader;
 
@@ -68,8 +68,9 @@
             final SavedQueryPayload payload = new SavedQueryPayload(
                     cursor.getString(cursor.getColumnIndex(SavedQueriesColumns.QUERY)));
             results.add(new SearchResult.Builder()
-                    .addTitle(payload.query)
-                    .addPayload(payload)
+                    .setStableId(payload.hashCode())
+                    .setTitle(payload.query)
+                    .setPayload(payload)
                     .build());
         }
         return results;
diff --git a/src/com/android/settings/search2/SavedQueryPayload.java b/src/com/android/settings/search/SavedQueryPayload.java
similarity index 93%
rename from src/com/android/settings/search2/SavedQueryPayload.java
rename to src/com/android/settings/search/SavedQueryPayload.java
index 6316894..0a151fc 100644
--- a/src/com/android/settings/search2/SavedQueryPayload.java
+++ b/src/com/android/settings/search/SavedQueryPayload.java
@@ -12,9 +12,10 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.os.Parcel;
 import android.support.annotation.VisibleForTesting;
@@ -27,11 +28,13 @@
     public final String query;
 
     public SavedQueryPayload(String query) {
+        super(null /* Intent */);
         this.query = query;
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     SavedQueryPayload(Parcel in) {
+        super(null /* Intent */);
         query = in.readString();
     }
 
diff --git a/src/com/android/settings/search2/SavedQueryRecorder.java b/src/com/android/settings/search/SavedQueryRecorder.java
similarity index 98%
rename from src/com/android/settings/search2/SavedQueryRecorder.java
rename to src/com/android/settings/search/SavedQueryRecorder.java
index e2325e8..466af0b 100644
--- a/src/com/android/settings/search2/SavedQueryRecorder.java
+++ b/src/com/android/settings/search/SavedQueryRecorder.java
@@ -12,9 +12,10 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/android/settings/search2/SavedQueryRemover.java b/src/com/android/settings/search/SavedQueryRemover.java
similarity index 97%
rename from src/com/android/settings/search2/SavedQueryRemover.java
rename to src/com/android/settings/search/SavedQueryRemover.java
index 4395cb6..47bb3ba 100644
--- a/src/com/android/settings/search2/SavedQueryRemover.java
+++ b/src/com/android/settings/search/SavedQueryRemover.java
@@ -12,9 +12,10 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/src/com/android/settings/search2/SavedQueryViewHolder.java b/src/com/android/settings/search/SavedQueryViewHolder.java
similarity index 84%
rename from src/com/android/settings/search2/SavedQueryViewHolder.java
rename to src/com/android/settings/search/SavedQueryViewHolder.java
index e468eb9..14509b6 100644
--- a/src/com/android/settings/search2/SavedQueryViewHolder.java
+++ b/src/com/android/settings/search/SavedQueryViewHolder.java
@@ -12,13 +12,16 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.view.View;
 import android.widget.TextView;
 
+import com.android.internal.logging.nano.MetricsProto;
+
 public class SavedQueryViewHolder extends SearchViewHolder {
 
     public final TextView titleView;
@@ -31,6 +34,11 @@
     }
 
     @Override
+    public int getClickActionMetricName() {
+        return MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY;
+    }
+
+    @Override
     public void onBind(SearchFragment fragment, SearchResult result) {
         titleView.setText(result.title);
         titleView.setOnClickListener(v -> fragment.onSavedQueryClicked(result.title));
diff --git a/src/com/android/settings/search2/SearchActivity.java b/src/com/android/settings/search/SearchActivity.java
similarity index 93%
rename from src/com/android/settings/search2/SearchActivity.java
rename to src/com/android/settings/search/SearchActivity.java
index 5a8455b..61a580b 100644
--- a/src/com/android/settings/search2/SearchActivity.java
+++ b/src/com/android/settings/search/SearchActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,9 +12,10 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/src/com/android/settings/search2/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
similarity index 61%
rename from src/com/android/settings/search2/SearchFeatureProvider.java
rename to src/com/android/settings/search/SearchFeatureProvider.java
index fa052fc..2fbebba 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
@@ -34,14 +37,6 @@
     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.
      */
     DatabaseResultLoader getDatabaseSearchLoader(Context context, String query);
@@ -67,9 +62,15 @@
     SiteMapManager getSiteMapManager();
 
     /**
-     * Updates the Settings indexes
+     * Updates the Settings indexes and calls {@link IndexingCallback#onIndexingFinished()} on
+     * {@param callback} when indexing is complete.
      */
-    void updateIndex(Context context, IndexingCallback callback);
+    void updateIndexAsync(Context context, IndexingCallback callback);
+
+    /**
+     * Synchronously updates the Settings database.
+     */
+    void updateIndex(Context context);
 
     /**
      * @returns true when indexing is complete.
@@ -95,5 +96,38 @@
     default void hideFeedbackButton() {
     }
 
+    /**
+     * Query search results based on the input query.
+     *
+     * @param context application context
+     * @param query input user query
+     * @param searchResultsRankerCallback {@link SearchResultsRankerCallback}
+     */
+    default void querySearchResults(Context context, String query,
+            SearchResultsRankerCallback searchResultsRankerCallback) {
+    }
+
+    /**
+     * Cancel pending search query
+     */
+    default void cancelPendingSearchQuery(Context context) {
+    }
+
+    /**
+     * Notify that a search result is clicked.
+     *
+     * @param context application context
+     * @param query input user query
+     * @param searchResult clicked result
+     */
+    default void searchResultClicked(Context context, String query, SearchResult searchResult) {
+    }
+
+    /**
+     * @return true to enable search ranking.
+     */
+    default boolean isSmartSearchRankingEnabled(Context context) {
+        return false;
+    }
 
 }
diff --git a/src/com/android/settings/search2/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
similarity index 60%
rename from src/com/android/settings/search2/SearchFeatureProviderImpl.java
rename to src/com/android/settings/search/SearchFeatureProviderImpl.java
index 4e47f9d..2bcd383 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 @@
 
     private static final String TAG = "SearchFeatureProvider";
 
+    private static final String METRICS_ACTION_SETTINGS_INDEX = "search_synchronous_indexing";
+
     private DatabaseIndexingManager mDatabaseIndexingManager;
     private SiteMapManager mSiteMapManager;
 
@@ -47,35 +41,15 @@
     }
 
     @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 @@
     }
 
     @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 2a5c961..69c2062 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.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 @@
  * 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 @@
     @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 @@
 
     @Override
     public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS;
+        return MetricsEvent.DASHBOARD_SEARCH_RESULTS;
     }
 
     @Override
@@ -134,7 +141,7 @@
         setHasOptionsMenu(true);
 
         final LoaderManager loaderManager = getLoaderManager();
-        mSearchAdapter = new SearchResultsAdapter(this);
+        mSearchAdapter = new SearchResultsAdapter(this, mSearchFeatureProvider);
         mSavedQueryController = new SavedQueryController(
                 getContext(), loaderManager, mSearchAdapter);
         mSearchFeatureProvider.initFeedbackButton();
@@ -149,16 +156,9 @@
         }
 
         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 @@
         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 @@
             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 @@
         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 @@
             mSavedQueryController.loadSavedQueries();
             mSearchFeatureProvider.hideFeedbackButton();
         } else {
+            mSearchAdapter.initializeSearch(mQuery);
             restartLoaders();
         }
 
@@ -251,7 +284,7 @@
     }
 
     @Override
-    public Loader<List<? extends SearchResult>> onCreateLoader(int id, Bundle args) {
+    public Loader<Set<? extends SearchResult>> onCreateLoader(int id, Bundle args) {
         final Activity activity = getActivity();
 
         switch (id) {
@@ -265,25 +298,18 @@
     }
 
     @Override
-    public void onLoadFinished(Loader<List<? extends SearchResult>> loader,
-            List<? extends SearchResult> data) {
+    public void onLoadFinished(Loader<Set<? extends SearchResult>> loader,
+            Set<? extends SearchResult> data) {
         mSearchAdapter.addSearchResults(data, loader.getClass().getName());
         if (mUnfinishedLoadersCount.decrementAndGet() != 0) {
             return;
         }
-        final int resultCount = mSearchAdapter.displaySearchResults();
 
-        if (resultCount == 0) {
-            mNoResultsView.setVisibility(View.VISIBLE);
-        } else {
-            mNoResultsView.setVisibility(View.GONE);
-            mResultsRecyclerView.scrollToPosition(0);
-        }
-        mSearchFeatureProvider.showFeedbackButton(this, getView());
+        mSearchAdapter.notifyResultsLoaded();
     }
 
     @Override
-    public void onLoaderReset(Loader<List<? extends SearchResult>> loader) {
+    public void onLoaderReset(Loader<Set<? extends SearchResult>> loader) {
     }
 
     /**
@@ -305,15 +331,30 @@
         requery();
     }
 
-    public void onSearchResultClicked() {
+    public void onSearchResultClicked(SearchViewHolder resultViewHolder, SearchResult result,
+            Pair<Integer, Object>... logTaggedData) {
+        logSearchResultClicked(resultViewHolder, result, logTaggedData);
+        mSearchFeatureProvider.searchResultClicked(getContext(), mQuery, result);
         mSavedQueryController.saveQuery(mQuery);
         mResultClickCount++;
     }
 
+    public void onSearchResultsDisplayed(int resultCount) {
+        if (resultCount == 0) {
+            mNoResultsView.setVisibility(View.VISIBLE);
+            mMetricsFeatureProvider.visible(getContext(), getMetricsCategory(),
+                    MetricsEvent.SETTINGS_SEARCH_NO_RESULT);
+        } else {
+            mNoResultsView.setVisibility(View.GONE);
+            mResultsRecyclerView.scrollToPosition(0);
+        }
+        mSearchFeatureProvider.showFeedbackButton(this, getView());
+    }
+
     public void onSavedQueryClicked(CharSequence query) {
         final String queryString = query.toString();
         mMetricsFeatureProvider.action(getContext(),
-                MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY);
+                MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY);
         mSearchView.setQuery(queryString, false /* submit */);
         onQueryTextChange(queryString);
     }
@@ -347,19 +388,6 @@
         onQueryTextChange(query);
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    SearchView makeSearchView(ActionBar actionBar, String query) {
-        final SearchView searchView = new SearchView(actionBar.getThemedContext());
-        searchView.setIconifiedByDefault(false);
-        searchView.setQuery(query, false /* submitQuery */);
-        searchView.setOnQueryTextListener(this);
-        searchView.setTag(SEARCH_TAG, searchView);
-        final LayoutParams lp =
-                new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-        searchView.setLayoutParams(lp);
-        return searchView;
-    }
-
     private void hideKeyboard() {
         final Activity activity = getActivity();
         if (activity != null) {
@@ -373,4 +401,37 @@
             mResultsRecyclerView.requestFocus();
         }
     }
-}
\ No newline at end of file
+
+    private void logSearchResultClicked(SearchViewHolder resultViewHolder, SearchResult result,
+            Pair<Integer, Object>... logTaggedData) {
+        final Intent intent = result.payload.getIntent();
+        if (intent == null) {
+            Log.w(TAG, "Skipped logging click on search result because of null intent, which can " +
+                    "happen on saved query results.");
+            return;
+        }
+        final ComponentName cn = intent.getComponent();
+        String resultName = intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT);
+        if (TextUtils.isEmpty(resultName) && cn != null) {
+            resultName = cn.flattenToString();
+        }
+        final List<Pair<Integer, Object>> taggedData = new ArrayList<>();
+        if (logTaggedData != null) {
+            taggedData.addAll(Arrays.asList(logTaggedData));
+        }
+        taggedData.add(Pair.create(
+                MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_COUNT,
+                mSearchAdapter.getItemCount()));
+        taggedData.add(Pair.create(
+                MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK,
+                resultViewHolder.getAdapterPosition()));
+        taggedData.add(Pair.create(
+                MetricsEvent.FIELD_SETTINGS_SERACH_QUERY_LENGTH,
+                TextUtils.isEmpty(mQuery) ? 0 : mQuery.length()));
+
+        mMetricsFeatureProvider.action(getContext(),
+                resultViewHolder.getClickActionMetricName(),
+                resultName,
+                taggedData.toArray(new Pair[0]));
+    }
+}
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index d1d6945..31d39b5 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.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.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 @@
 
 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 @@
     @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 @@
         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 @@
                 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 @@
         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 @@
                 R.drawable.ic_settings_accessibility);
         addIndex(ChannelImportanceSettings.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_notifications);
+        addIndex(DreamSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
+        addIndex(SupportDashboardActivity.class, NO_DATA_RES_ID, R.drawable.ic_help);
     }
 
     private SearchIndexableResources() {
diff --git a/src/com/android/settings/search2/SearchResult.java b/src/com/android/settings/search/SearchResult.java
similarity index 74%
rename from src/com/android/settings/search2/SearchResult.java
rename to src/com/android/settings/search/SearchResult.java
index ecc41b6..d96661a 100644
--- a/src/com/android/settings/search2/SearchResult.java
+++ b/src/com/android/settings/search/SearchResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,20 +12,24 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.util.Log;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Data class as an interface for all Search Results.
  */
 public class SearchResult implements Comparable<SearchResult> {
 
+    private static final String TAG = "SearchResult";
+
     /**
      * Defines the lowest rank for a search result to be considered as ranked. Results with ranks
      * higher than this have no guarantee for sorting order.
@@ -83,9 +87,10 @@
     /**
      * Stable id for this object.
      */
-    public final long stableId;
+    public final int stableId;
 
     protected SearchResult(Builder builder) {
+        stableId = builder.mStableId;
         title = builder.mTitle;
         summary = builder.mSummary;
         breadcrumbs = builder.mBreadcrumbs;
@@ -93,7 +98,6 @@
         icon = builder.mIcon;
         payload = builder.mResultPayload;
         viewType = payload.getType();
-        stableId = Objects.hash(title, summary, breadcrumbs, rank, viewType);
     }
 
     @Override
@@ -105,19 +109,19 @@
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
+    public boolean equals(Object that) {
+        if (this == that) {
             return true;
         }
-        if (!(obj instanceof SearchResult)) {
+        if (!(that instanceof SearchResult)) {
             return false;
         }
-        return this.stableId == ((SearchResult) obj).stableId;
+        return this.stableId == ((SearchResult) that).stableId;
     }
 
     @Override
     public int hashCode() {
-        return (int) stableId;
+        return stableId;
     }
 
     public static class Builder {
@@ -127,13 +131,14 @@
         protected int mRank = 42;
         protected ResultPayload mResultPayload;
         protected Drawable mIcon;
+        protected int mStableId;
 
-        public Builder addTitle(CharSequence title) {
+        public Builder setTitle(CharSequence title) {
             mTitle = title;
             return this;
         }
 
-        public Builder addSummary(CharSequence summary) {
+        public Builder setSummary(CharSequence summary) {
             mSummary = summary;
             return this;
         }
@@ -143,29 +148,37 @@
             return this;
         }
 
-        public Builder addRank(int rank) {
+        public Builder setRank(int rank) {
             if (rank >= 0 && rank <= 9) {
                 mRank = rank;
             }
             return this;
         }
 
-        public Builder addIcon(Drawable icon) {
+        public Builder setIcon(Drawable icon) {
             mIcon = icon;
             return this;
         }
 
-        public Builder addPayload(ResultPayload payload) {
+        public Builder setPayload(ResultPayload payload) {
             mResultPayload = payload;
             return this;
         }
 
+        public Builder setStableId(int stableId) {
+            mStableId = stableId;
+            return this;
+        }
+
         public SearchResult build() {
             // Check that all of the mandatory fields are set.
-            if (mTitle == null) {
-                throw new IllegalArgumentException("SearchResult missing title argument");
+            if (TextUtils.isEmpty(mTitle)) {
+                throw new IllegalStateException("SearchResult missing title argument");
+            } else if (mStableId == 0) {
+                Log.v(TAG, "No stable ID on SearchResult with title: " + mTitle);
+                throw new IllegalStateException("SearchResult missing stableId argument");
             } else if (mResultPayload == null) {
-                throw new IllegalArgumentException("SearchResult missing Payload argument");
+                throw new IllegalStateException("SearchResult missing Payload argument");
             }
             return new SearchResult(this);
         }
diff --git a/src/com/android/settings/search2/SearchResultDiffCallback.java b/src/com/android/settings/search/SearchResultDiffCallback.java
similarity index 97%
rename from src/com/android/settings/search2/SearchResultDiffCallback.java
rename to src/com/android/settings/search/SearchResultDiffCallback.java
index 9bd1bde..b7bbc66 100644
--- a/src/com/android/settings/search2/SearchResultDiffCallback.java
+++ b/src/com/android/settings/search/SearchResultDiffCallback.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.support.v7.util.DiffUtil;
 
diff --git a/src/com/android/settings/search/SearchResultsAdapter.java b/src/com/android/settings/search/SearchResultsAdapter.java
new file mode 100644
index 0000000..d2ace0e
--- /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 185a5fe..ed72940 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 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 @@
         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 1bf0a15..a13081a 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -23,8 +23,6 @@
 import android.provider.SearchIndexablesProvider;
 import android.util.Log;
 
-import com.android.settings.search2.DatabaseIndexingUtils;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -60,8 +58,8 @@
             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 17f1743..c81381c 100644
--- a/src/com/android/settings/search2/XmlParserUtils.java
+++ b/src/com/android/settings/search/XmlParserUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java b/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java
new file mode 100644
index 0000000..c254a40
--- /dev/null
+++ b/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.search.ranking;
+
+import android.util.Pair;
+
+import java.util.List;
+
+public interface SearchResultsRankerCallback {
+
+    /**
+     * Called when ranker provides the ranking scores.
+     * @param searchRankingScores Ordered List of Pairs of String and Float corresponding to
+     *                            stableIds and ranking scores. The list must be descendingly
+     *                            ordered based on scores.
+     */
+    public void onRankingScoresAvailable(List<Pair<String, Float>> searchRankingScores);
+
+    /**
+     * Called when for any reason ranker fails, which notifies the client to proceed
+     * without ranking results.
+     */
+    public void onRankingFailed();
+}
diff --git a/src/com/android/settings/search2/CursorToSearchResultConverter.java b/src/com/android/settings/search2/CursorToSearchResultConverter.java
deleted file mode 100644
index 71d999e..0000000
--- a/src/com/android/settings/search2/CursorToSearchResultConverter.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search2;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.graphics.drawable.Drawable;
-import android.os.BadParcelableException;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settings.dashboard.SiteMapManager;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_CLASS_NAME;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ICON;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ID;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_INTENT_ACTION;
-import static com.android.settings.search2.DatabaseResultLoader
-        .COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS;
-import static com.android.settings.search2.DatabaseResultLoader
-        .COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_KEY;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD_TYPE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_SCREEN_TITLE;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_SUMMARY_ON;
-import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_TITLE;
-
-/**
- * Controller to Build search results from {@link Cursor} Objects.
- *
- * Each converted {@link Cursor} has the following fields:
- * - String Title
- * - String Summary
- * - int rank
- * - {@link Drawable} icon
- * - {@link ResultPayload} payload
- */
-class CursorToSearchResultConverter {
-
-    private final String TAG = "CursorConverter";
-
-    private final String mQueryText;
-
-    private final Context mContext;
-
-    private final Set<String> mKeys;
-
-    private final int LONG_TITLE_LENGTH = 20;
-
-    private static final String[] whiteList = {
-            "main_toggle_wifi",
-            "main_toggle_bluetooth",
-            "toggle_airplane",
-            "tether_settings",
-            "battery_saver",
-            "toggle_nfc",
-            "restrict_background",
-            "data_usage_enable",
-            "button_roaming_key",
-    };
-    private static final Set<String> prioritySettings = new HashSet(Arrays.asList(whiteList));
-
-
-    public CursorToSearchResultConverter(Context context, String queryText) {
-        mContext = context;
-        mKeys = new HashSet<>();
-        mQueryText = queryText;
-    }
-
-    public List<SearchResult> convertCursor(SiteMapManager sitemapManager,
-            Cursor cursorResults, int baseRank) {
-        if (cursorResults == null) {
-            return null;
-        }
-        final Map<String, Context> contextMap = new HashMap<>();
-        final List<SearchResult> results = new ArrayList<>();
-
-        while (cursorResults.moveToNext()) {
-            SearchResult result = buildSingleSearchResultFromCursor(sitemapManager,
-                    contextMap, cursorResults, baseRank);
-            if (result != null) {
-                results.add(result);
-            }
-        }
-        Collections.sort(results);
-        return results;
-    }
-
-    private SearchResult buildSingleSearchResultFromCursor(SiteMapManager sitemapManager,
-            Map<String, Context> contextMap, Cursor cursor, int baseRank) {
-        final String docId = cursor.getString(COLUMN_INDEX_ID);
-        /* Make sure that this result has not yet been added as a result. Checking the docID
-           covers the case of multiple queries matching the same row, but we need to also to check
-           for potentially the same named or slightly varied names pointing to the same page.
-         */
-        if (mKeys.contains(docId)) {
-            return null;
-        }
-        mKeys.add(docId);
-
-        final String pkgName = cursor.getString(COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE);
-        final String action = cursor.getString(COLUMN_INDEX_INTENT_ACTION);
-        final String title = cursor.getString(COLUMN_INDEX_TITLE);
-        final String summaryOn = cursor.getString(COLUMN_INDEX_SUMMARY_ON);
-        final String className = cursor.getString(COLUMN_INDEX_CLASS_NAME);
-        final String key = cursor.getString(COLUMN_INDEX_KEY);
-        final String iconResStr = cursor.getString(COLUMN_INDEX_ICON);
-        final int payloadType = cursor.getInt(COLUMN_INDEX_PAYLOAD_TYPE);
-        final byte[] marshalledPayload = cursor.getBlob(COLUMN_INDEX_PAYLOAD);
-        final ResultPayload payload;
-
-        if (marshalledPayload != null) {
-            payload = getUnmarshalledPayload(marshalledPayload, payloadType);
-        } else if (payloadType == ResultPayload.PayloadType.INTENT) {
-            payload = getIntentPayload(cursor, action, key, className, pkgName);
-        } else {
-            Log.w(TAG, "Error creating payload - bad marshalling data or mismatched types");
-            return null;
-        }
-
-        final List<String> breadcrumbs = getBreadcrumbs(sitemapManager, cursor);
-        final int rank = getRank(title, breadcrumbs, baseRank, key);
-
-        final SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addTitle(title)
-                .addSummary(summaryOn)
-                .addBreadcrumbs(breadcrumbs)
-                .addRank(rank)
-                .addIcon(getIconForPackage(contextMap, pkgName, className, iconResStr))
-                .addPayload(payload);
-        return builder.build();
-    }
-
-    private Drawable getIconForPackage(Map<String, Context> contextMap, String pkgName,
-            String className, String iconResStr) {
-        final int iconId = TextUtils.isEmpty(iconResStr)
-                ? 0 : Integer.parseInt(iconResStr);
-        Drawable icon;
-        Context packageContext;
-        if (iconId == 0) {
-            icon = null;
-        } else {
-            if (TextUtils.isEmpty(className) && !TextUtils.isEmpty(pkgName)) {
-                packageContext = contextMap.get(pkgName);
-                if (packageContext == null) {
-                    try {
-                        packageContext = mContext.createPackageContext(pkgName, 0);
-                    } catch (PackageManager.NameNotFoundException e) {
-                        Log.e(TAG, "Cannot create Context for package: " + pkgName);
-                        return null;
-                    }
-                    contextMap.put(pkgName, packageContext);
-                }
-            } else {
-                packageContext = mContext;
-            }
-            try {
-                icon = packageContext.getDrawable(iconId);
-            } catch (Resources.NotFoundException nfe) {
-                icon = null;
-            }
-        }
-        return icon;
-    }
-
-    private IntentPayload getIntentPayload(Cursor cursor, String action, String key,
-            String className, String pkgName ) {
-        IntentPayload payload;
-        if (TextUtils.isEmpty(action)) {
-            final String screenTitle = cursor.getString(COLUMN_INDEX_SCREEN_TITLE);
-            // Action is null, we will launch it as a sub-setting
-            final Bundle args = new Bundle();
-            args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
-            final Intent intent = Utils.onBuildStartFragmentIntent(mContext,
-                    className, args, null, 0, screenTitle, false,
-                    MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
-            payload = new IntentPayload(intent);
-        } else {
-            final Intent intent = new Intent(action);
-            final String targetClass = cursor.getString(COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS);
-            if (!TextUtils.isEmpty(pkgName) && !TextUtils.isEmpty(targetClass)) {
-                final ComponentName component = new ComponentName(pkgName, targetClass);
-                intent.setComponent(component);
-            }
-            intent.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
-            payload = new IntentPayload(intent);
-        }
-        return payload;
-    }
-
-    private ResultPayload getUnmarshalledPayload(byte[] unmarshalledPayload, int payloadType) {
-        try {
-            switch (payloadType) {
-                case ResultPayload.PayloadType.INLINE_SWITCH:
-                    return ResultPayloadUtils.unmarshall(unmarshalledPayload,
-                            InlineSwitchPayload.CREATOR);
-            }
-        } catch (BadParcelableException e) {
-            Log.w(TAG, "Error creating parcelable: " + e);
-        }
-        return null;
-    }
-
-    private List<String> getBreadcrumbs(SiteMapManager siteMapManager, Cursor cursor) {
-        final String screenTitle = cursor.getString(COLUMN_INDEX_SCREEN_TITLE);
-        final String screenClass = cursor.getString(COLUMN_INDEX_CLASS_NAME);
-        return siteMapManager == null ? null : siteMapManager.buildBreadCrumb(mContext, screenClass,
-                screenTitle);
-    }
-
-    /** Uses the breadcrumbs to determine the offset to the base rank.
-     *  There are three checks
-     *  A) If the result is prioritized and the highest base level
-     *  B) If the query matches the highest level menu title
-     *  C) If the query matches a subsequent menu title
-     *  D) Is the title longer than 20
-     *
-     *  If the query matches A, set it to TOP_RANK
-     *  If the query matches B and C, the offset is 0.
-     *  If the query matches C only, the offset is 1.
-     *  If the query matches neither B nor C, the offset is 2.
-     *  If the query matches D, the offset is 2
-
-     * @param title of the result.
-     * @param crumbs from the Information Architecture
-     * @param baseRank of the result. Lower if it's a better result.
-     * @return
-     */
-    private int getRank(String title, List<String> crumbs, int baseRank, String key) {
-        // The result can only be prioritized if it is a top ranked result.
-        if (prioritySettings.contains(key) && baseRank < DatabaseResultLoader.BASE_RANKS[1]) {
-            return SearchResult.TOP_RANK;
-        }
-        if (title.length() > LONG_TITLE_LENGTH) {
-            return baseRank + 2;
-        }
-        return baseRank;
-    }
-
-}
diff --git a/src/com/android/settings/search2/InlinePayload.java b/src/com/android/settings/search2/InlinePayload.java
deleted file mode 100644
index 4b1c168..0000000
--- a/src/com/android/settings/search2/InlinePayload.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search2;
-
-/**
- * Abstract Payload for inline settings results.
- */
-public abstract class InlinePayload extends ResultPayload {
-    /**
-     * Defines the URI to access and store the Setting the inline result represents
-     */
-    public String settingsUri;
-
-    /**
-     * The UI type for the inline result.
-     */
-    @PayloadType public int inlineType;
-
-    /**
-     * Defines where the Setting is stored.
-     */
-    @SettingsSource public int settingSource;
-
-    public InlinePayload(String uri, @PayloadType int type, @SettingsSource int source) {
-        settingsUri = uri;
-        inlineType = type;
-        settingSource = source;
-    }
-}
diff --git a/src/com/android/settings/search2/InlineSwitchPayload.java b/src/com/android/settings/search2/InlineSwitchPayload.java
deleted file mode 100644
index b009976..0000000
--- a/src/com/android/settings/search2/InlineSwitchPayload.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search2;
-
-import android.content.Context;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.provider.Settings;
-
-import java.util.Map;
-
-/**
- * Payload for inline Switch results. Mappings from integer to boolean.
- */
-public class InlineSwitchPayload extends InlinePayload {
-    /**
-     * Maps Inline values to UI-consumable Values.
-     * For example, if you have a switch preference whose values are stored as ints, the two valid
-     * list of mappings would be:
-     * < (0,True), (1, false) >
-     * < (1,True), (0, false) >
-     */
-    public final Map<Integer, Boolean> valueMap;
-
-    public InlineSwitchPayload(String newUri, @SettingsSource int settingsSource,
-            Map<Integer, Boolean> map) {
-        super(newUri, PayloadType.INLINE_SWITCH, settingsSource);
-        valueMap = map;
-    }
-
-    private InlineSwitchPayload(Parcel in) {
-        super(in.readString() /* Uri */ , in.readInt() /* Payload Type */,
-                in.readInt() /* Settings Source */);
-        valueMap = in.readHashMap(Integer.class.getClassLoader());
-    }
-
-    @Override
-    public int getType() {
-        return inlineType;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(settingsUri);
-        dest.writeInt(inlineType);
-        dest.writeInt(settingSource);
-        dest.writeMap(valueMap);
-    }
-
-    public static final Parcelable.Creator<InlineSwitchPayload> CREATOR =
-            new Parcelable.Creator<InlineSwitchPayload>() {
-        @Override
-        public InlineSwitchPayload createFromParcel(Parcel in) {
-            return new InlineSwitchPayload(in);
-        }
-
-        @Override
-        public InlineSwitchPayload[] newArray(int size) {
-            return new InlineSwitchPayload[size];
-        }
-    };
-
-    public boolean getSwitchValue(Context context) {
-        if (valueMap == null) {
-            throw new IllegalStateException("Value map is null");
-        }
-
-        int settingsValue = -1;
-        switch(settingSource) {
-            case SettingsSource.SECURE:
-                settingsValue = Settings.Secure.getInt(context.getContentResolver(),
-                        settingsUri, 0);
-                break;
-            case SettingsSource.SYSTEM:
-                settingsValue = Settings.System.getInt(context.getContentResolver(),
-                        settingsUri, 0);
-                break;
-
-            case SettingsSource.GLOBAL:
-                settingsValue = Settings.Global.getInt(context.getContentResolver(),
-                        settingsUri, 0);
-                break;
-        }
-
-        if (settingsValue == -1) {
-            throw new IllegalStateException("Unable to find setting from uri: "
-                    + settingsUri.toString());
-        }
-
-        for (Integer key : valueMap.keySet()) {
-            if ((key == settingsValue)) {
-                return valueMap.get(key);
-            }
-        }
-
-        throw new IllegalStateException("No results matched the key: " + settingsValue);
-    }
-
-    public void setSwitchValue(Context context, boolean isChecked) {
-        if (valueMap == null) {
-            throw new IllegalStateException("Value map is null");
-        }
-        int switchValue = -1;
-
-        for (Map.Entry<Integer, Boolean> pair : valueMap.entrySet()) {
-            if (pair.getValue() == isChecked) {
-                switchValue = pair.getKey();
-                break;
-            }
-        }
-
-        if (switchValue == -1) {
-            throw new IllegalStateException("Switch value is not set");
-        }
-
-        switch(settingSource) {
-            case SettingsSource.GLOBAL:
-                Settings.Global.putInt(context.getContentResolver(), settingsUri, switchValue);
-                return;
-            case SettingsSource.SECURE:
-                Settings.Secure.putInt(context.getContentResolver(), settingsUri, switchValue);
-                return;
-            case SettingsSource.SYSTEM:
-                Settings.System.putInt(context.getContentResolver(), settingsUri, switchValue);
-                return;
-            case SettingsSource.UNKNOWN:
-                return;
-        }
-    }
-}
diff --git a/src/com/android/settings/search2/IntentPayload.java b/src/com/android/settings/search2/IntentPayload.java
deleted file mode 100644
index 3e1049e..0000000
--- a/src/com/android/settings/search2/IntentPayload.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search2;
-
-import android.content.Intent;
-import android.os.Parcel;
-
-/**
- * Encapsulates the standard intent based results as seen in first party apps and Settings results.
- */
-public class IntentPayload extends ResultPayload {
-    public final Intent intent;
-
-    private IntentPayload(Parcel in) {
-        intent = in.readParcelable(IntentPayload.class.getClassLoader());
-    }
-
-    public IntentPayload(Intent newIntent) {
-        intent = newIntent;
-    }
-
-    @ResultPayload.PayloadType public int getType() {
-        return PayloadType.INTENT;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeParcelable(intent, flags);
-    }
-
-    public static final Creator<IntentPayload> CREATOR = new Creator<IntentPayload>() {
-        @Override
-        public IntentPayload createFromParcel(Parcel in) {
-            return new IntentPayload(in);
-        }
-
-        @Override
-        public IntentPayload[] newArray(int size) {
-            return new IntentPayload[size];
-        }
-    };
-
-}
\ No newline at end of file
diff --git a/src/com/android/settings/search2/IntentSearchViewHolder.java b/src/com/android/settings/search2/IntentSearchViewHolder.java
deleted file mode 100644
index 9a7e395..0000000
--- a/src/com/android/settings/search2/IntentSearchViewHolder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.search2;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.Pair;
-import android.view.View;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsActivity;
-
-/**
- * ViewHolder for intent based search results.
- * The DatabaseResultLoader is the primary use case for this ViewHolder.
- */
-public class IntentSearchViewHolder extends SearchViewHolder {
-
-    public IntentSearchViewHolder(View view) {
-        super(view);
-    }
-
-    @Override
-    public void onBind(final SearchFragment fragment, final SearchResult result) {
-        super.onBind(fragment, result);
-
-        itemView.setOnClickListener(v -> {
-            fragment.onSearchResultClicked();
-            final Intent intent = ((IntentPayload) result.payload).intent;
-            final ComponentName cn = intent.getComponent();
-            final Pair<Integer, Object> rank = Pair.create(
-                    MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK, getAdapterPosition());
-            String resultName = intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT);
-            if (TextUtils.isEmpty(resultName) && cn != null) {
-                resultName = cn.flattenToString();
-            }
-            mMetricsFeatureProvider.action(v.getContext(),
-                    MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT,
-                    resultName, rank);
-            // 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);
-            }
-        });
-    }
-}
diff --git a/src/com/android/settings/search2/ResultPayload.java b/src/com/android/settings/search2/ResultPayload.java
deleted file mode 100644
index 4294234..0000000
--- a/src/com/android/settings/search2/ResultPayload.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search2;
-
-import android.annotation.IntDef;
-import android.os.Parcelable;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * A interface for search results types. Examples include Inline results, third party apps
- * or any future possibilities.
- */
-public abstract class ResultPayload implements Parcelable {
-
-    @IntDef({PayloadType.INLINE_SLIDER, PayloadType.INLINE_SWITCH,
-            PayloadType.INTENT, PayloadType.SAVED_QUERY})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface PayloadType {
-        /**
-         * Resulting page will be started using an intent
-         */
-        int INTENT = 0;
-
-        /**
-         * Result is a inline widget, using a slider widget as UI.
-         */
-        int INLINE_SLIDER = 1;
-
-        /**
-         * Result is a inline widget, using a toggle widget as UI.
-         */
-        int INLINE_SWITCH = 2;
-
-        /**
-         * Result is a recently saved query.
-         */
-        int SAVED_QUERY = 3;
-    }
-
-    @IntDef({SettingsSource.UNKNOWN, SettingsSource.SYSTEM, SettingsSource.SECURE,
-            SettingsSource.GLOBAL})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface SettingsSource {
-        int UNKNOWN = 0;
-        int SYSTEM = 1;
-        int SECURE = 2;
-        int GLOBAL = 3;
-    }
-
-
-    @ResultPayload.PayloadType
-    public abstract int getType();
-}
diff --git a/src/com/android/settings/search2/SearchResultsAdapter.java b/src/com/android/settings/search2/SearchResultsAdapter.java
deleted file mode 100644
index 60f2f7c..0000000
--- a/src/com/android/settings/search2/SearchResultsAdapter.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search2;
-
-import android.content.Context;
-import android.support.annotation.MainThread;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.util.DiffUtil;
-import android.support.v7.widget.RecyclerView;
-import android.util.ArrayMap;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.settings.R;
-import com.android.settings.search2.ResultPayload.PayloadType;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static com.android.settings.search2.SearchResult.BOTTOM_RANK;
-import static com.android.settings.search2.SearchResult.TOP_RANK;
-
-public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder> {
-
-    private final SearchFragment mFragment;
-
-    private List<SearchResult> mSearchResults;
-    private Map<String, List<? extends SearchResult>> mResultsMap;
-
-    public SearchResultsAdapter(SearchFragment fragment) {
-        mFragment = fragment;
-        mSearchResults = new ArrayList<>();
-        mResultsMap = new ArrayMap<>();
-
-        setHasStableIds(true);
-    }
-
-    @Override
-    public SearchViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        final Context context = parent.getContext();
-        final LayoutInflater inflater = LayoutInflater.from(context);
-        final View view;
-        switch (viewType) {
-            case PayloadType.INTENT:
-                view = inflater.inflate(R.layout.search_intent_item, parent, false);
-                return new IntentSearchViewHolder(view);
-            case PayloadType.INLINE_SWITCH:
-                view = inflater.inflate(R.layout.search_inline_switch_item, parent, false);
-                return new InlineSwitchViewHolder(view, context);
-            case PayloadType.SAVED_QUERY:
-                view = inflater.inflate(R.layout.search_saved_query_item, parent, false);
-                return new SavedQueryViewHolder(view);
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(SearchViewHolder holder, int position) {
-        holder.onBind(mFragment, mSearchResults.get(position));
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return mSearchResults.get(position).stableId;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return mSearchResults.get(position).viewType;
-    }
-
-    @Override
-    public int getItemCount() {
-        return mSearchResults.size();
-    }
-
-    /**
-     * Store the results from each of the loaders to be merged when all loaders are finished.
-     *
-     * @param results         the results from the loader.
-     * @param loaderClassName class name of the loader.
-     */
-    @MainThread
-    public void addSearchResults(List<? extends SearchResult> results, String loaderClassName) {
-        if (results == null) {
-            return;
-        }
-        mResultsMap.put(loaderClassName, results);
-    }
-
-    /**
-     * Displays recent searched queries.
-     *
-     * @return The number of saved queries to display
-     */
-    public int displaySavedQuery(List<? extends SearchResult> data) {
-        clearResults();
-        mSearchResults.addAll(data);
-        notifyDataSetChanged();
-        return mSearchResults.size();
-    }
-
-    /**
-     * Merge the results from each of the loaders into one list for the adapter.
-     * Prioritizes results from the local database over installed apps.
-     *
-     * @return Number of matched results
-     */
-    public int displaySearchResults() {
-        final List<? extends SearchResult> databaseResults = mResultsMap
-                .get(DatabaseResultLoader.class.getName());
-        final List<? extends SearchResult> installedAppResults = mResultsMap
-                .get(InstalledAppResultLoader.class.getName());
-        final int dbSize = (databaseResults != null) ? databaseResults.size() : 0;
-        final int appSize = (installedAppResults != null) ? installedAppResults.size() : 0;
-        final List<SearchResult> newResults = new ArrayList<>(dbSize + appSize);
-
-        int dbIndex = 0;
-        int appIndex = 0;
-        int rank = TOP_RANK;
-
-        while (rank <= BOTTOM_RANK) {
-            while ((dbIndex < dbSize) && (databaseResults.get(dbIndex).rank == rank)) {
-                newResults.add(databaseResults.get(dbIndex++));
-            }
-            while ((appIndex < appSize) && (installedAppResults.get(appIndex).rank == rank)) {
-                newResults.add(installedAppResults.get(appIndex++));
-            }
-            rank++;
-        }
-
-        while (dbIndex < dbSize) {
-            newResults.add(databaseResults.get(dbIndex++));
-        }
-        while (appIndex < appSize) {
-            newResults.add(installedAppResults.get(appIndex++));
-        }
-
-        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
-                new SearchResultDiffCallback(mSearchResults, newResults), false /* detectMoves */);
-        mSearchResults = newResults;
-        diffResult.dispatchUpdatesTo(this);
-
-        return mSearchResults.size();
-    }
-
-    public void clearResults() {
-        mSearchResults.clear();
-        mResultsMap.clear();
-        notifyDataSetChanged();
-    }
-
-    @VisibleForTesting
-    public List<SearchResult> getSearchResults() {
-        return mSearchResults;
-    }
-}
diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
new file mode 100644
index 0000000..3c89340
--- /dev/null
+++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.CredentialStorage;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.password.ChooseLockGeneric;
+
+/**
+ * Prompt for key guard configuration confirmation.
+ */
+public class ConfigureKeyGuardDialog extends InstrumentedDialogFragment
+        implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+    public static final String TAG = "ConfigureKeyGuardDialog";
+
+    private boolean mConfigureConfirmed;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.CONFIGURE_KEYGUARD_DIALOG;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(android.R.string.dialog_alert_title)
+                .setMessage(R.string.credentials_configure_lock_screen_hint)
+                .setPositiveButton(android.R.string.ok, this)
+                .setNegativeButton(android.R.string.cancel, this)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int button) {
+        mConfigureConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        if (mConfigureConfirmed) {
+            mConfigureConfirmed = false;
+            startPasswordSetup();
+            return;
+        } else {
+            final Activity activity = getActivity();
+            if (activity != null) {
+                activity.finish();
+            }
+        }
+    }
+
+    @VisibleForTesting
+    void startPasswordSetup() {
+        Intent intent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                CredentialStorage.MIN_PASSWORD_QUALITY);
+        startActivity(intent);
+    }
+}
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index 3137863..e239a43 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -24,10 +24,10 @@
 import com.android.settings.R;
 import com.android.settings.accounts.AddUserWhenLockedPreferenceController;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.notification.LockScreenNotificationPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -68,6 +68,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_lockscreen;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         final Lifecycle lifecycle = getLifecycle();
diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java
index 259ef12..a687cb9 100644
--- a/src/com/android/settings/security/OwnerInfoPreferenceController.java
+++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java
@@ -25,12 +25,12 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.OwnerInfoSettings;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 public class OwnerInfoPreferenceController extends PreferenceController
         implements LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java
new file mode 100644
index 0000000..f881e2f
--- /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 0000000..819d5f7
--- /dev/null
+++ b/src/com/android/settings/support/SupportDashboardActivity.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.support;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.android.settings.R;
+import com.android.settings.Settings.LegacySupportActivity;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SupportFeatureProvider;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Trampoline activity that decides which version of support should be shown to the user.
+ */
+public class SupportDashboardActivity extends Activity implements Indexable {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        SupportFeatureProvider supportFeatureProvider = FeatureFactory.getFactory(this)
+                .getSupportFeatureProvider(this);
+
+        // try to launch support v2 if we have the feature provider
+        if (supportFeatureProvider != null && supportFeatureProvider.isSupportV2Enabled()) {
+            supportFeatureProvider.startSupportV2(this);
+        } else {
+            startActivity(new Intent(this, LegacySupportActivity.class));
+            finish();
+        }
+    }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                private static final String SUPPORT_SEARCH_INDEX_KEY = "support_dashboard_activity";
+
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+
+                    final List<SearchIndexableRaw> result = new ArrayList<>();
+
+                    // Add the activity title
+                    SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = context.getString(R.string.page_tab_title_support);
+                    data.screenTitle = context.getString(R.string.settings_label);
+                    data.summaryOn = context.getString(R.string.support_summary);
+                    data.iconResId = R.drawable.ic_help;
+                    data.intentTargetPackage = context.getPackageName();
+                    data.intentTargetClass = SupportDashboardActivity.class.getName();
+                    data.intentAction = Intent.ACTION_MAIN;
+                    data.key = SUPPORT_SEARCH_INDEX_KEY;
+                    result.add(data);
+
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    if (!context.getResources().getBoolean(R.bool.config_support_enabled)) {
+                        keys.add(SUPPORT_SEARCH_INDEX_KEY);
+                    }
+                    return keys;
+                }
+            };
+}
diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java
index 4eb14bd..9b7a9df 100644
--- a/src/com/android/settings/survey/SurveyMixin.java
+++ b/src/com/android/settings/survey/SurveyMixin.java
@@ -18,11 +18,11 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.BroadcastReceiver;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SurveyFeatureProvider;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * attaches extra, survey related work to the onResume method of registered observable classes
diff --git a/src/com/android/settings/system/FactoryResetPreferenceController.java b/src/com/android/settings/system/FactoryResetPreferenceController.java
index a3cf10a..4379105 100644
--- a/src/com/android/settings/system/FactoryResetPreferenceController.java
+++ b/src/com/android/settings/system/FactoryResetPreferenceController.java
@@ -45,7 +45,7 @@
     /** 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 d4685bc..c04e374 100644
--- a/src/com/android/settings/system/ResetDashboardFragment.java
+++ b/src/com/android/settings/system/ResetDashboardFragment.java
@@ -23,11 +23,11 @@
 import com.android.settings.R;
 import com.android.settings.applications.ResetAppPrefPreferenceController;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.NetworkResetPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index 1a5a182..fd164be 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -55,6 +55,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_system_dashboard;
+    }
+
+    @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         return buildPreferenceControllers(context);
     }
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 0dfdab6..e8823a6 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -36,7 +36,7 @@
 import com.android.settings.applications.LayoutPreference;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 8026e27..bef2e9a 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -54,7 +54,6 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.ChooseLockGeneric;
 import com.android.settings.DimmableIconPreference;
 import com.android.settings.OwnerInfoSettings;
 import com.android.settings.R;
@@ -62,11 +61,12 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.drawable.CircleFramedDrawable;
 
 import java.util.ArrayList;
@@ -74,8 +74,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 /**
  * Screen that manages the list of users on the device.
  * Guest user is an always visible entry, even if the guest is not currently
@@ -727,6 +725,7 @@
         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 @@
                 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 @@
             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 1dc6ae5..ae393fd 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -34,6 +34,8 @@
 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.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 @@
         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 @@
 
         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 @@
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
                     final boolean enable = (boolean) newValue;
-                    return setEnabled(cn, title, enable);
+                    return setEnabled(cn, summary, enable);
                 }
             });
             screen.addPreference(pref);
         }
     }
 
+    private int getCurrentUser(int managedProfileId) {
+        if (managedProfileId != UserHandle.USER_NULL) {
+            return managedProfileId;
+        }
+        return UserHandle.myUserId();
+    }
+
     protected boolean setEnabled(ComponentName service, String title, boolean enable) {
         if (!enable) {
             // the simple version: disabling
diff --git a/src/com/android/settings/utils/ThreadUtils.java b/src/com/android/settings/utils/ThreadUtils.java
deleted file mode 100644
index f71a2a9..0000000
--- a/src/com/android/settings/utils/ThreadUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.utils;
-
-import android.os.Looper;
-
-public class ThreadUtils {
-    private static volatile Thread sMainThread;
-
-    /**
-     * Returns true if the current thread is the UI thread.
-     */
-    public static boolean isMainThread() {
-        if (sMainThread == null) {
-            sMainThread = Looper.getMainLooper().getThread();
-        }
-        return Thread.currentThread() == sMainThread;
-    }
-
-    /**
-     * Checks that the current thread is the UI thread. Otherwise throws an exception.
-     */
-    public static void ensureMainThread() {
-        if (!isMainThread()) {
-            throw new RuntimeException("Must be called on the UI thread");
-        }
-    }
-
-}
diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
index afbb0b4..90c5888 100644
--- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
+++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
@@ -45,7 +45,7 @@
         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 bef4777..1ca8ac7 100644
--- a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
+++ b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
@@ -90,8 +90,13 @@
                 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 0000000..0c6b02f
--- /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 8482b9f..0000000
--- 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 506ada9..b50a50a 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -22,6 +22,7 @@
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
+import android.graphics.Typeface;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.view.View;
@@ -38,8 +39,7 @@
     // 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 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 @@
         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 @@
                 getWidth() - mStrokeWidth,
                 getHeight() - mStrokeWidth,
                 TOP,
-                (360 * mPercent / 100),
+                (360 *  (float) mPercent),
                 false,
                 mFilledArc);
     }
@@ -138,7 +140,7 @@
     /**
      * 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/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
new file mode 100644
index 0000000..8f64920
--- /dev/null
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.annotation.IdRes;
+import android.annotation.UserIdInt;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+import android.support.annotation.IntDef;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.settings.AppHeader;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.InstalledAppDetails;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+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,
+            ActionType.ACTION_APP_PREFERENCE,
+            ActionType.ACTION_NOTIF_PREFERENCE})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface ActionType {
+        int ACTION_NONE = 0;
+        int ACTION_APP_INFO = 1;
+        int ACTION_APP_PREFERENCE = 2;
+        int ACTION_NOTIF_PREFERENCE = 3;
+    }
+
+    public static final String PREF_KEY_APP_HEADER = "pref_app_header";
+
+    private static final String TAG = "AppDetailFeature";
+
+    private final Context mAppContext;
+    private final Activity mActivity;
+    private final Fragment mFragment;
+    private final int mMetricsCategory;
+    private final View mHeader;
+    private Lifecycle mLifecycle;
+    private RecyclerView mRecyclerView;
+    private Drawable mIcon;
+    private String mIconContentDescription;
+    private CharSequence mLabel;
+    private CharSequence mSummary;
+    private String mPackageName;
+    private Intent mAppNotifPrefIntent;
+    @UserIdInt
+    private int mUid = UserHandle.USER_NULL;
+    @ActionType
+    private int mAction1;
+    @ActionType
+    private int mAction2;
+
+    private boolean mIsInstantApp;
+
+    /**
+     * Creates a new instance of the controller.
+     *
+     * @param fragment The fragment that header will be placed in.
+     * @param header   Optional: header view if it's already created.
+     */
+    public static EntityHeaderController newInstance(Activity activity, Fragment fragment,
+            View header) {
+        return new EntityHeaderController(activity, fragment, header);
+    }
+
+    private EntityHeaderController(Activity activity, Fragment fragment, View header) {
+        mActivity = activity;
+        mAppContext = activity.getApplicationContext();
+        mFragment = fragment;
+        mMetricsCategory = FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()
+                .getMetricsCategory(fragment);
+        if (header != null) {
+            mHeader = header;
+        } else {
+            mHeader = LayoutInflater.from(fragment.getContext())
+                    .inflate(R.layout.settings_entity_header, null /* root */);
+        }
+    }
+
+    public EntityHeaderController setRecyclerView(RecyclerView recyclerView, Lifecycle lifecycle) {
+        mRecyclerView = recyclerView;
+        mLifecycle = lifecycle;
+        return this;
+    }
+
+    /**
+     * Set the icon in the header. Callers should also consider calling setIconContentDescription
+     * to provide a description of this icon for accessibility purposes.
+     */
+    public EntityHeaderController setIcon(Drawable icon) {
+        if (icon != null) {
+            mIcon = icon.getConstantState().newDrawable(mAppContext.getResources());
+        }
+        return this;
+    }
+
+    /**
+     * Convenience method to set the header icon from an ApplicationsState.AppEntry. Callers should
+     * also consider calling setIconContentDescription to provide a description of this icon for
+     * accessibility purposes.
+     */
+    public EntityHeaderController setIcon(ApplicationsState.AppEntry appEntry) {
+        if (appEntry.icon != null) {
+            mIcon = appEntry.icon.getConstantState().newDrawable(mAppContext.getResources());
+        }
+        return this;
+    }
+
+    public EntityHeaderController setIconContentDescription(String contentDescription) {
+        mIconContentDescription = contentDescription;
+        return this;
+    }
+
+    public EntityHeaderController setLabel(CharSequence label) {
+        mLabel = label;
+        return this;
+    }
+
+    public EntityHeaderController setLabel(ApplicationsState.AppEntry appEntry) {
+        mLabel = appEntry.label;
+        return this;
+    }
+
+    public EntityHeaderController setSummary(CharSequence summary) {
+        mSummary = summary;
+        return this;
+    }
+
+    public EntityHeaderController setSummary(PackageInfo packageInfo) {
+        if (packageInfo != null) {
+            mSummary = packageInfo.versionName;
+        }
+        return this;
+    }
+
+    public EntityHeaderController setButtonActions(@ActionType int action1,
+            @ActionType int action2) {
+        mAction1 = action1;
+        mAction2 = action2;
+        return this;
+    }
+
+    public EntityHeaderController setPackageName(String packageName) {
+        mPackageName = packageName;
+        return this;
+    }
+
+    public EntityHeaderController setUid(int uid) {
+        mUid = uid;
+        return this;
+    }
+
+    public EntityHeaderController setAppNotifPrefIntent(Intent appNotifPrefIntent) {
+        mAppNotifPrefIntent = appNotifPrefIntent;
+        return this;
+    }
+
+    public EntityHeaderController setIsInstantApp(boolean isInstantApp) {
+        this.mIsInstantApp = isInstantApp;
+        return this;
+    }
+
+    /**
+     * Done mutating entity header, rebinds everything and return a new {@link LayoutPreference}.
+     */
+    public LayoutPreference done(Activity activity, Context uiContext) {
+        final LayoutPreference pref = new LayoutPreference(uiContext, done(activity));
+        // Makes sure it's the first preference onscreen.
+        pref.setOrder(-1000);
+        pref.setKey(PREF_KEY_APP_HEADER);
+        return pref;
+    }
+
+    /**
+     * Done mutating entity header, rebinds everything (optionally skip rebinding buttons).
+     */
+    public View done(Activity activity, boolean rebindActions) {
+        styleActionBar(activity);
+        ImageView iconView = mHeader.findViewById(R.id.entity_header_icon);
+        if (iconView != null) {
+            iconView.setImageDrawable(mIcon);
+            iconView.setContentDescription(mIconContentDescription);
+        }
+        setText(R.id.entity_header_title, mLabel);
+        setText(R.id.entity_header_summary, mSummary);
+        if (mIsInstantApp) {
+            setText(R.id.install_type,
+                    mHeader.getResources().getString(R.string.install_type_instant));
+        }
+
+        if (rebindActions) {
+            bindHeaderButtons();
+        }
+
+        return mHeader;
+    }
+
+    /**
+     * Only binds entity header with button actions.
+     */
+    public EntityHeaderController bindHeaderButtons() {
+        ImageButton button1 = mHeader.findViewById(android.R.id.button1);
+        ImageButton button2 = mHeader.findViewById(android.R.id.button2);
+
+        bindButton(button1, mAction1);
+        bindButton(button2, mAction2);
+        return this;
+    }
+
+    public EntityHeaderController styleActionBar(Activity activity) {
+        if (activity == null) {
+            Log.w(TAG, "No activity, cannot style actionbar.");
+            return this;
+        }
+        final ActionBar actionBar = activity.getActionBar();
+        if (actionBar == null) {
+            Log.w(TAG, "No actionbar, cannot style actionbar.");
+            return this;
+        }
+        actionBar.setBackgroundDrawable(
+                new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorSecondary)));
+        actionBar.setElevation(0);
+        if (mRecyclerView != null && mLifecycle != null) {
+            ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
+        }
+
+        return this;
+    }
+
+    /**
+     * Done mutating entity header, rebinds everything.
+     */
+    @VisibleForTesting
+    View done(Activity activity) {
+        return done(activity, true /* rebindActions */);
+    }
+
+    private void bindButton(ImageButton button, @ActionType int action) {
+        if (button == null) {
+            return;
+        }
+        switch (action) {
+            case ActionType.ACTION_APP_INFO: {
+                if (mPackageName == null || mPackageName.equals(Utils.OS_PKG)
+                        || mUid == UserHandle.USER_NULL
+                        || !AppHeader.includeAppInfo(mFragment)) {
+                    button.setVisibility(View.GONE);
+                } else {
+                    button.setContentDescription(
+                            mAppContext.getString(R.string.application_info_label));
+                    button.setImageResource(com.android.settings.R.drawable.ic_info);
+                    button.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            AppInfoBase.startAppInfoFragment(
+                                    InstalledAppDetails.class, R.string.application_info_label,
+                                    mPackageName, mUid, mFragment, 0 /* request */,
+                                    mMetricsCategory);
+
+                        }
+                    });
+                    button.setVisibility(View.VISIBLE);
+                }
+                return;
+            }
+            case ActionType.ACTION_NOTIF_PREFERENCE: {
+                if (mAppNotifPrefIntent == null) {
+                    button.setVisibility(View.GONE);
+                } else {
+                    button.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()
+                                    .actionWithSource(mAppContext, mMetricsCategory,
+                                            ACTION_OPEN_APP_NOTIFICATION_SETTING);
+                            mFragment.startActivity(mAppNotifPrefIntent);
+                        }
+                    });
+                    button.setVisibility(View.VISIBLE);
+                }
+                return;
+            }
+            case ActionType.ACTION_APP_PREFERENCE: {
+                final Intent intent = resolveIntent(
+                        new Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(mPackageName));
+                if (intent == null) {
+                    button.setVisibility(View.GONE);
+                    return;
+                }
+                button.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()
+                                .actionWithSource(mAppContext, mMetricsCategory,
+                                        ACTION_OPEN_APP_SETTING);
+                        mFragment.startActivity(intent);
+                    }
+                });
+                button.setVisibility(View.VISIBLE);
+                return;
+            }
+            case ActionType.ACTION_NONE: {
+                button.setVisibility(View.GONE);
+                return;
+            }
+        }
+    }
+
+    private Intent resolveIntent(Intent i) {
+        ResolveInfo result = mAppContext.getPackageManager().resolveActivity(i, 0);
+        if (result != null) {
+            return new Intent(i.getAction())
+                    .setClassName(result.activityInfo.packageName, result.activityInfo.name);
+        }
+        return null;
+    }
+
+    private void setText(@IdRes int id, CharSequence text) {
+        TextView textView = mHeader.findViewById(id);
+        if (textView != null) {
+            textView.setText(text);
+            textView.setVisibility(TextUtils.isEmpty(text) ? View.GONE : View.VISIBLE);
+        }
+    }
+}
diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java
new file mode 100644
index 0000000..c83dff4
--- /dev/null
+++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils.TruncateAt;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+/**
+ * A preference whose summary text will only span one single line.
+ */
+public class FixedLineSummaryPreference extends Preference {
+
+    private int mSummaryLineCount;
+
+    public FixedLineSummaryPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FixedLineSummaryPreference,
+                0, 0);
+        if (a.hasValue(R.styleable.FixedLineSummaryPreference_summaryLineCount)) {
+            mSummaryLineCount = a.getInteger(
+                    R.styleable.FixedLineSummaryPreference_summaryLineCount, 1);
+        } else {
+            mSummaryLineCount = 1;
+        }
+    }
+
+    public void setSummaryLineCount(int count) {
+        mSummaryLineCount = count;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        TextView summary = (TextView) holder.findViewById(android.R.id.summary);
+        if (summary != null) {
+            summary.setMinLines(mSummaryLineCount);
+            summary.setMaxLines(mSummaryLineCount);
+            summary.setEllipsize(TruncateAt.END);
+        }
+    }
+}
diff --git a/src/com/android/settings/widget/FooterPreference.java b/src/com/android/settings/widget/FooterPreference.java
deleted file mode 100644
index 84e3ed8..0000000
--- a/src/com/android/settings/widget/FooterPreference.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.content.Context;
-import android.support.v4.content.res.TypedArrayUtils;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.text.method.LinkMovementMethod;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-/**
- * A custom preference acting as "footer" of a page. It has a field for icon and text. It is added
- * to screen as the last preference.
- */
-public class FooterPreference extends Preference {
-
-    static final int ORDER_FOOTER = Integer.MAX_VALUE - 1;
-    static final String KEY_FOOTER = "footer_preference";
-
-    public FooterPreference(Context context, AttributeSet attrs) {
-        super(context, attrs, TypedArrayUtils.getAttr(
-                context, R.attr.footerPreferenceStyle, android.R.attr.preferenceStyle));
-        init();
-    }
-
-    public FooterPreference(Context context) {
-        this(context, null);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        TextView title = holder.itemView.findViewById(android.R.id.title);
-        title.setMovementMethod(new LinkMovementMethod());
-        title.setClickable(false);
-        title.setLongClickable(false);
-    }
-
-    private void init() {
-        setIcon(R.drawable.ic_info_outline_24dp);
-        setKey(KEY_FOOTER);
-        setOrder(ORDER_FOOTER);
-        setSelectable(false);
-    }
-}
diff --git a/src/com/android/settings/widget/FooterPreferenceMixin.java b/src/com/android/settings/widget/FooterPreferenceMixin.java
deleted file mode 100644
index 53e3d75..0000000
--- a/src/com/android/settings/widget/FooterPreferenceMixin.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.content.Context;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.SetPreferenceScreen;
-
-public class FooterPreferenceMixin implements LifecycleObserver, SetPreferenceScreen {
-
-    private final PreferenceFragment mFragment;
-    private FooterPreference mFooterPreference;
-
-    public FooterPreferenceMixin(PreferenceFragment fragment, Lifecycle lifecycle) {
-        mFragment = fragment;
-        lifecycle.addObserver(this);
-    }
-
-    @Override
-    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
-        if (mFooterPreference != null) {
-            preferenceScreen.addPreference(mFooterPreference);
-        }
-    }
-
-    /**
-     * Creates a new {@link FooterPreference}.
-     */
-    public FooterPreference createFooterPreference() {
-        final PreferenceScreen screen = mFragment.getPreferenceScreen();
-        if (mFooterPreference != null && screen != null) {
-            screen.removePreference(mFooterPreference);
-        }
-        mFooterPreference = new FooterPreference(getPrefContext());
-
-        if (screen != null) {
-            screen.addPreference(mFooterPreference);
-        }
-        return mFooterPreference;
-    }
-
-    /**
-     * Returns an UI context with theme properly set for new Preference objects.
-     */
-    private Context getPrefContext() {
-        return mFragment.getPreferenceManager().getContext();
-    }
-
-    public boolean hasFooter() {
-        return mFooterPreference != null;
-    }
-}
-
diff --git a/src/com/android/settings/widget/ScrollToParentEditText.java b/src/com/android/settings/widget/ScrollToParentEditText.java
new file mode 100644
index 0000000..705e918
--- /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 90%
rename from src/com/android/settings/SeekBarPreference.java
rename to src/com/android/settings/widget/SeekBarPreference.java
index a8d5fbf..ee7d4b8 100644
--- a/src/com/android/settings/SeekBarPreference.java
+++ b/src/com/android/settings/widget/SeekBarPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -22,6 +22,7 @@
 import android.os.Parcelable;
 import android.support.v4.content.res.TypedArrayUtils;
 import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.View;
@@ -45,6 +46,7 @@
     private int mDefaultProgress = -1;
 
     private SeekBar mSeekBar;
+    private boolean mShouldBlink;
 
     public SeekBarPreference(
             Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -79,6 +81,11 @@
         this(context, null);
     }
 
+    public void setShouldBlink(boolean shouldBlink) {
+        mShouldBlink = shouldBlink;
+        notifyChanged();
+    }
+
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
         super.onBindViewHolder(view);
@@ -89,9 +96,26 @@
         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 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 af80fd4..c3aaba5 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 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 @@
 
     private static final String TAG = "ConfigureWifiSettings";
 
+    private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
     private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
 
     @Override
@@ -59,9 +58,14 @@
     @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 @@
     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 6e88d79..7cf19f2 100644
--- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
+++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
@@ -28,10 +28,10 @@
 import android.text.TextUtils;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} that controls whether we should notify user when open network is
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index bf67565..ee4acd1 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -127,17 +127,25 @@
         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 09f5e92..cea4d46 100644
--- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
+++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
@@ -8,7 +8,6 @@
 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.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 @@
 
     private Preference mPreference;
     private ComponentName mEnableUseWifiComponentName;
+    private boolean mDoFeatureSupportedScorersExist;
 
     public UseOpenWifiPreferenceController(Context context, Fragment fragment,
             NetworkScoreManagerWrapper networkScoreManagerWrapper, Lifecycle lifecycle) {
@@ -52,6 +55,7 @@
         mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
         mSettingObserver = new SettingObserver();
         updateEnableUseWifiComponentName();
+        checkForFeatureSupportedScorers();
         lifecycle.addObserver(this);
     }
 
@@ -61,6 +65,21 @@
                 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 @@
 
     @Override
     public boolean isAvailable() {
-        return mEnableUseWifiComponentName != null;
+        return mDoFeatureSupportedScorersExist;
     }
 
     @Override
@@ -93,8 +112,23 @@
             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 8e577a4..5d725d8 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -25,6 +25,7 @@
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
+import android.text.BidiFormatter;
 
 import com.android.settings.R;
 import com.android.settings.datausage.DataSaverBackend;
@@ -109,12 +110,13 @@
         }
     }
 
-    public void updateConfigSummary(WifiConfiguration wifiConfig) {
+    private void updateConfigSummary(WifiConfiguration wifiConfig) {
         String s = mContext.getString(
                 com.android.internal.R.string.wifi_tether_configure_ssid_default);
-        mSwitch.setSummary(String.format(
-                    mContext.getString(R.string.wifi_tether_enabled_subtext),
-                    (wifiConfig == null) ? s : wifiConfig.SSID));
+
+        mSwitch.setSummary(mContext.getString(R.string.wifi_tether_enabled_subtext,
+                BidiFormatter.getInstance().unicodeWrap(
+                        (wifiConfig == null) ? s : wifiConfig.SSID)));
     }
 
     private void updateTetherState(Object[] available, Object[] tethered, Object[] errored) {
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index fb01f1f..2a17dfc 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -75,7 +75,7 @@
  */
 public class WifiConfigController implements TextWatcher,
         AdapterView.OnItemSelectedListener, OnCheckedChangeListener,
-        TextView.OnEditorActionListener, View.OnKeyListener{
+        TextView.OnEditorActionListener, View.OnKeyListener {
     private static final String TAG = "WifiConfigController";
 
     private static final String SYSTEM_CA_STORE_PATH = "/system/etc/security/cacerts";
@@ -110,6 +110,8 @@
     public static final int WIFI_PEAP_PHASE2_AKA        = 4;
     public static final int WIFI_PEAP_PHASE2_AKA_PRIME  = 5;
 
+    private static final int SSID_ASCII_MAX_LENGTH = 32;
+
     /* Phase2 methods supported by PEAP are limited */
     private final ArrayAdapter<String> mPhase2PeapAdapter;
     /* Full list of phase2 methods */
@@ -457,7 +459,14 @@
     void showWarningMessagesIfAppropriate() {
         mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
+        mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
 
+        if (mSsidView != null) {
+            final String ssid = mSsidView.getText().toString();
+            if (ssid.length() > SSID_ASCII_MAX_LENGTH) {
+                mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.VISIBLE);
+            }
+        }
         if (mEapCaCertSpinner != null
                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
             String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java
index f88e38b..238f0e1 100644
--- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java
@@ -29,10 +29,10 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} that updates MAC/IP address.
diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
index 09b3331..bc61cff 100644
--- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
@@ -20,14 +20,14 @@
 
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
 import com.android.settings.widget.SummaryUpdater;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settings.widget.MasterSwitchController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
 public class WifiMasterSwitchPreferenceController extends PreferenceController
         implements SummaryUpdater.OnSummaryChangeListener,
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ee8285b..cc10293 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -43,7 +43,6 @@
 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 @@
     // 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 @@
         // 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 @@
         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 @@
         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 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);
         }
@@ -413,6 +430,19 @@
     }
 
     @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 @@
 
             case WifiManager.WIFI_STATE_DISABLED:
                 setOffMessage();
+                setAdditionalSettingsSummaries();
                 setProgressBarVisible(false);
                 break;
         }
@@ -712,6 +743,21 @@
         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 @@
             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 @@
                 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 @@
         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 3e7911b..0000000
--- a/src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.core.PreferenceController;
-
-import static com.android.internal.os.MemoryPowerCalculator.TAG;
-
-public class WifiSleepPolicyPreferenceController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener {
-
-    private static final String KEY_SLEEP_POLICY = "sleep_policy";
-
-    public WifiSleepPolicyPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_SLEEP_POLICY;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        ListPreference sleepPolicyPref = (ListPreference) preference;
-        if (sleepPolicyPref != null) {
-            if (Utils.isWifiOnly(mContext)) {
-                sleepPolicyPref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only);
-            }
-            int value = Settings.Global.getInt(mContext.getContentResolver(),
-                    Settings.Global.WIFI_SLEEP_POLICY,
-                    Settings.Global.WIFI_SLEEP_POLICY_NEVER);
-            String stringValue = String.valueOf(value);
-            sleepPolicyPref.setValue(stringValue);
-            updateSleepPolicySummary(sleepPolicyPref, stringValue);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        try {
-            String stringValue = (String) newValue;
-            Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_SLEEP_POLICY,
-                    Integer.parseInt(stringValue));
-            updateSleepPolicySummary(preference, stringValue);
-        } catch (NumberFormatException e) {
-            Toast.makeText(mContext, R.string.wifi_setting_sleep_policy_error,
-                    Toast.LENGTH_SHORT).show();
-            return false;
-        }
-        return true;
-    }
-
-    private void updateSleepPolicySummary(Preference sleepPolicyPref, String value) {
-        if (value != null) {
-            String[] values = mContext.getResources().getStringArray(R.array
-                    .wifi_sleep_policy_values);
-            final int summaryArrayResId = Utils.isWifiOnly(mContext)
-                    ? R.array.wifi_sleep_policy_entries_wifi_only
-                    : R.array.wifi_sleep_policy_entries;
-            String[] summaries = mContext.getResources().getStringArray(summaryArrayResId);
-            for (int i = 0; i < values.length; i++) {
-                if (value.equals(values[i])) {
-                    if (i < summaries.length) {
-                        sleepPolicyPref.setSummary(summaries[i]);
-                        return;
-                    }
-                }
-            }
-        }
-
-        sleepPolicyPref.setSummary("");
-        Log.e(TAG, "Invalid sleep policy value: " + value);
-    }
-
-}
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index 9eea74a..f174b4f 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -29,10 +29,11 @@
 import com.android.settings.R;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settings.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 @@
         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 @@
         boolean networkRecommendationsEnabled = Settings.Global.getInt(
                 mContext.getContentResolver(),
                 Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0) == 1;
-        enableWifiWakeup.setEnabled(networkRecommendationsEnabled && wifiScanningEnabled);
+        boolean activeScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
+        enableWifiWakeup.setEnabled(
+                networkRecommendationsEnabled && wifiScanningEnabled && activeScorerSet);
 
-        enableWifiWakeup.setSummary(wifiScanningEnabled ?
-                R.string.wifi_wakeup_summary :
-                R.string.wifi_wakeup_summary_scanning_disabled);
+        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 736d231..7aaa7eb 100644
--- a/src/com/android/settings/wifi/WpsPreferenceController.java
+++ b/src/com/android/settings/wifi/WpsPreferenceController.java
@@ -31,10 +31,10 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} that shows Dialog for WPS progress. Disabled when Wi-Fi is off.
@@ -151,4 +151,4 @@
             return new WpsDialog(getActivity(), mWpsSetup);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 23e547a..b28a731 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.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.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 @@
     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 @@
     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 @@
     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 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 @@
         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 @@
 
     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 @@
         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 @@
                 mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
         mFragment.getActivity().finish();
     }
+
+    /**
+     * Sign in to the captive portal found on this wifi network associated with this preference.
+     */
+    private void signIntoNetwork() {
+        mMetricsFeatureProvider.action(
+                mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
+        mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork);
+    }
 }
diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
new file mode 100644
index 0000000..3df1978
--- /dev/null
+++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.p2p;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceController;
+
+public abstract class P2pCategoryPreferenceController extends PreferenceController {
+
+    protected PreferenceGroup mCategory;
+
+    public P2pCategoryPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mCategory = (PreferenceGroup) screen.findPreference(getPreferenceKey());
+    }
+
+    public void removeAllChildren() {
+        if (mCategory != null) {
+            mCategory.removeAll();
+            mCategory.setVisible(false);
+        }
+    }
+
+    public void addChild(Preference child) {
+        if (mCategory != null) {
+            mCategory.addPreference(child);
+            mCategory.setVisible(true);
+        }
+    }
+
+    public void setEnabled(boolean enabled) {
+        if (mCategory != null) {
+            mCategory.setEnabled(enabled);
+        }
+    }
+}
diff --git a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java b/src/com/android/settings/wifi/p2p/P2pPeerCategoryPreferenceController.java
similarity index 63%
rename from src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
rename to src/com/android/settings/wifi/p2p/P2pPeerCategoryPreferenceController.java
index b34b407..5baa403 100644
--- a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
+++ b/src/com/android/settings/wifi/p2p/P2pPeerCategoryPreferenceController.java
@@ -14,10 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.settings.core.lifecycle.events;
+package com.android.settings.wifi.p2p;
 
-import android.view.MenuItem;
+import android.content.Context;
 
-public interface OnOptionsItemSelected {
-    boolean onOptionsItemSelected(MenuItem menuItem);
+public class P2pPeerCategoryPreferenceController extends P2pCategoryPreferenceController {
+
+    public P2pPeerCategoryPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "p2p_peer_devices";
+    }
 }
diff --git a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java b/src/com/android/settings/wifi/p2p/P2pPersistentCategoryPreferenceController.java
similarity index 62%
copy from src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
copy to src/com/android/settings/wifi/p2p/P2pPersistentCategoryPreferenceController.java
index b34b407..139f698 100644
--- a/src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
+++ b/src/com/android/settings/wifi/p2p/P2pPersistentCategoryPreferenceController.java
@@ -14,10 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.settings.core.lifecycle.events;
+package com.android.settings.wifi.p2p;
 
-import android.view.MenuItem;
+import android.content.Context;
 
-public interface OnOptionsItemSelected {
-    boolean onOptionsItemSelected(MenuItem menuItem);
+public class P2pPersistentCategoryPreferenceController extends P2pCategoryPreferenceController {
+
+    public P2pPersistentCategoryPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "p2p_persistent_group";
+    }
 }
diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
new file mode 100644
index 0000000..ca992a9
--- /dev/null
+++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.p2p;
+
+import android.content.Context;
+import android.net.wifi.p2p.WifiP2pDevice;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceController;
+
+public class P2pThisDevicePreferenceController extends PreferenceController {
+
+    private Preference mPreference;
+
+    public P2pThisDevicePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return "p2p_this_device";
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    public void setEnabled(boolean enabled) {
+        if (mPreference != null) {
+            mPreference.setEnabled(enabled);
+        }
+    }
+
+    public void updateDeviceName(WifiP2pDevice thisDevice) {
+        if (mPreference != null && thisDevice != null) {
+            if (TextUtils.isEmpty(thisDevice.deviceName)) {
+                mPreference.setTitle(thisDevice.deviceAddress);
+            } else {
+                mPreference.setTitle(thisDevice.deviceName);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
index df871ab..3eb2b7b 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
@@ -25,10 +25,10 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * {@link PreferenceController} to toggle Wifi Direct preference on Wi-Fi state.
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 977be7e..cd328d9 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -39,8 +39,6 @@
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.InputFilter;
 import android.text.TextUtils;
@@ -53,12 +51,16 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /*
  * Displays Wi-fi p2p settings UI
  */
-public class WifiP2pSettings extends SettingsPreferenceFragment
+public class WifiP2pSettings extends DashboardFragment
         implements PersistentGroupInfoListener, PeerListListener {
 
     private static final String TAG = "WifiP2pSettings";
@@ -83,9 +85,9 @@
     private int mConnectedDevices;
     private boolean mLastGroupFormed = false;
 
-    private PreferenceGroup mPeersGroup;
-    private PreferenceGroup mPersistentGroup;
-    private Preference mThisDevicePref;
+    private P2pPeerCategoryPreferenceController mPeerCategoryController;
+    private P2pPersistentCategoryPreferenceController mPersistentCategoryController;
+    private P2pThisDevicePreferenceController mThisDevicePreferenceController;
 
     private static final int DIALOG_DISCONNECT  = 1;
     private static final int DIALOG_CANCEL_CONNECT = 2;
@@ -132,7 +134,7 @@
                 mThisDevice = (WifiP2pDevice) intent.getParcelableExtra(
                         WifiP2pManager.EXTRA_WIFI_P2P_DEVICE);
                 if (DBG) Log.d(TAG, "Update device info: " + mThisDevice);
-                updateDevicePref();
+                mThisDevicePreferenceController.updateDeviceName(mThisDevice);
             } else if (WifiP2pManager.WIFI_P2P_DISCOVERY_CHANGED_ACTION.equals(action)) {
                 int discoveryState = intent.getIntExtra(WifiP2pManager.EXTRA_DISCOVERY_STATE,
                     WifiP2pManager.WIFI_P2P_DISCOVERY_STOPPED);
@@ -150,21 +152,37 @@
         }
     };
 
-    public WifiP2pSettings() {
-        if (DBG) Log.d(TAG, "Creating WifiP2pSettings ...");
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.wifi_p2p_settings;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.WIFI_P2P;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        mPersistentCategoryController =
+                new P2pPersistentCategoryPreferenceController(context);
+        mPeerCategoryController =
+                new P2pPeerCategoryPreferenceController(context);
+        mThisDevicePreferenceController = new P2pThisDevicePreferenceController(context);
+        controllers.add(mPersistentCategoryController);
+        controllers.add(mPeerCategoryController);
+        controllers.add(mThisDevicePreferenceController);
+        return controllers;
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
-        addPreferencesFromResource(R.xml.wifi_p2p_settings);
-
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_DISCOVERY_CHANGED_ACTION);
-        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PERSISTENT_GROUPS_CHANGED_ACTION);
-
         final Activity activity = getActivity();
         mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
         if (mWifiP2pManager != null) {
@@ -180,7 +198,7 @@
 
         if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DIALOG_PEER)) {
             WifiP2pDevice device = savedInstanceState.getParcelable(SAVE_DIALOG_PEER);
-            mSelectedWifiPeer = new WifiP2pPeer(getActivity(), device);
+            mSelectedWifiPeer = new WifiP2pPeer(getPrefContext(), device);
         }
         if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DEVICE_NAME)) {
             mSavedDeviceName = savedInstanceState.getString(SAVE_DEVICE_NAME);
@@ -274,16 +292,17 @@
                             mWifiP2pManager.deletePersistentGroup(mChannel,
                                     mSelectedGroup.getNetworkId(),
                                     new WifiP2pManager.ActionListener() {
-                                public void onSuccess() {
-                                    if (DBG) Log.d(TAG, " delete group success");
-                                }
-                                public void onFailure(int reason) {
-                                    if (DBG) Log.d(TAG, " delete group fail " + reason);
-                                }
-                            });
+                                        public void onSuccess() {
+                                            if (DBG) Log.d(TAG, " delete group success");
+                                        }
+
+                                        public void onFailure(int reason) {
+                                            if (DBG) Log.d(TAG, " delete group fail " + reason);
+                                        }
+                                    });
                             mSelectedGroup = null;
                         } else {
-                            if (DBG) Log.w(TAG, " No selected group to delete!" );
+                            if (DBG) Log.w(TAG, " No selected group to delete!");
                         }
                     }
                 } else if (which == DialogInterface.BUTTON_NEGATIVE) {
@@ -295,31 +314,20 @@
             }
         };
 
-        setHasOptionsMenu(true);
-
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.removeAll();
-        preferenceScreen.setOrderingAsAdded(true);
-
-        mThisDevicePref = new Preference(getPrefContext());
-        mThisDevicePref.setPersistent(false);
-        mThisDevicePref.setSelectable(false);
-        preferenceScreen.addPreference(mThisDevicePref);
-
-        mPeersGroup = new PreferenceCategory(getPrefContext());
-        mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
-        preferenceScreen.addPreference(mPeersGroup);
-
-        mPersistentGroup = new PreferenceCategory(getPrefContext());
-        mPersistentGroup.setTitle(R.string.wifi_p2p_remembered_groups);
-        preferenceScreen.addPreference(mPersistentGroup);
-
         super.onActivityCreated(savedInstanceState);
     }
 
     @Override
     public void onResume() {
         super.onResume();
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_DISCOVERY_CHANGED_ACTION);
+        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PERSISTENT_GROUPS_CHANGED_ACTION);
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+
         getActivity().registerReceiver(mReceiver, mIntentFilter);
         if (mWifiP2pManager != null) {
             mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
@@ -491,11 +499,6 @@
     }
 
     @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.WIFI_P2P;
-    }
-
-    @Override
     public int getDialogMetricsCategory(int dialogId) {
         switch (dialogId) {
             case DIALOG_DISCONNECT:
@@ -524,13 +527,13 @@
     }
 
     private void handlePeersChanged() {
-        mPeersGroup.removeAll();
+        mPeerCategoryController.removeAllChildren();
 
         mConnectedDevices = 0;
         if (DBG) Log.d(TAG, "List of available peers");
         for (WifiP2pDevice peer: mPeers.getDeviceList()) {
             if (DBG) Log.d(TAG, "-> " + peer);
-            mPeersGroup.addPreference(new WifiP2pPeer(getActivity(), peer));
+            mPeerCategoryController.addChild(new WifiP2pPeer(getPrefContext(), peer));
             if (peer.status == WifiP2pDevice.CONNECTED) mConnectedDevices++;
         }
         if (DBG) Log.d(TAG, " mConnectedDevices " + mConnectedDevices);
@@ -538,12 +541,12 @@
 
     @Override
     public void onPersistentGroupInfoAvailable(WifiP2pGroupList groups) {
-        mPersistentGroup.removeAll();
+        mPersistentCategoryController.removeAllChildren();
 
         for (WifiP2pGroup group: groups.getGroupList()) {
             if (DBG) Log.d(TAG, " group " + group);
-            WifiP2pPersistentGroup wppg = new WifiP2pPersistentGroup(getActivity(), group);
-            mPersistentGroup.addPreference(wppg);
+            WifiP2pPersistentGroup wppg = new WifiP2pPersistentGroup(getPrefContext(), group);
+            mPersistentCategoryController.addChild(wppg);
             if (wppg.getGroupName().equals(mSelectedGroupName)) {
                 if (DBG) Log.d(TAG, "Selecting group " + wppg.getGroupName());
                 mSelectedGroup = wppg;
@@ -568,9 +571,9 @@
 
     private void handleP2pStateChanged() {
         updateSearchMenu(false);
-        mThisDevicePref.setEnabled(mWifiP2pEnabled);
-        mPeersGroup.setEnabled(mWifiP2pEnabled);
-        mPersistentGroup.setEnabled(mWifiP2pEnabled);
+        mThisDevicePreferenceController.setEnabled(mWifiP2pEnabled);
+        mPersistentCategoryController.setEnabled(mWifiP2pEnabled);
+        mPeerCategoryController.setEnabled(mWifiP2pEnabled);
     }
 
     private void updateSearchMenu(boolean searching) {
@@ -590,14 +593,4 @@
             });
         }
     }
-
-    private void updateDevicePref() {
-        if (mThisDevice != null) {
-            if (TextUtils.isEmpty(mThisDevice.deviceName)) {
-                mThisDevicePref.setTitle(mThisDevice.deviceAddress);
-            } else {
-                mThisDevicePref.setTitle(mThisDevice.deviceName);
-            }
-        }
-    }
 }
diff --git a/tests/app/res/values-ky/strings.xml b/tests/app/res/values-ky/strings.xml
index 766d591..a1136c9 100644
--- a/tests/app/res/values-ky/strings.xml
+++ b/tests/app/res/values-ky/strings.xml
@@ -19,10 +19,10 @@
     <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_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_hello" msgid="5926168503597475062">"Салам, өндүрүүчү!"</string>
     <string name="manufacturer_settings_title" msgid="3516742885166545864">"Өндүрүүчү"</string>
     <string name="manufacturer_settings_summary" msgid="4436962417539186408">"Тандалган аракетти баштоо үчүн колдонула турган өндүрүүчүнүн куралы"</string>
 </resources>
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 0000000..5b372ad
--- /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 0f95715..22e98c7 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.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 @@
 
         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 924e716..e2bd6ee 100644
--- a/tests/app/src/com/android/settings/ChooseLockGenericTest.java
+++ b/tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import static android.support.test.InstrumentationRegistry.getInstrumentation;
 import static android.support.test.InstrumentationRegistry.getTargetContext;
@@ -56,7 +56,7 @@
  * m SettingsTests &&
  * adb install \
  * -r -g  ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
- * adb shell am instrument -e class com.android.settings.ChooseLockGenericTest \
+ * adb shell am instrument -e class com.android.settings.password.ChooseLockGenericTest \
  * -w com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner
  */
 @RunWith(AndroidJUnit4.class)
diff --git a/tests/app/src/com/android/settings/ConfirmLockPasswordTest.java b/tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
similarity index 97%
rename from tests/app/src/com/android/settings/ConfirmLockPasswordTest.java
rename to tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
index 05464ad..25e7da0 100644
--- a/tests/app/src/com/android/settings/ConfirmLockPasswordTest.java
+++ b/tests/app/src/com/android/settings/password/ConfirmLockPasswordTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.pressKey;
@@ -30,6 +30,8 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.view.KeyEvent;
 
+import com.android.settings.R;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
new file mode 100644
index 0000000..78acc3e
--- /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 e6fe899..d342881 100644
--- a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
+++ b/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.ActivityTestRule;
@@ -28,11 +28,13 @@
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
 import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withTagKey;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.core.AllOf.allOf;
 
+import com.android.settings.R;
+
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
@@ -43,7 +45,7 @@
 
     @Test
     public void test_OpenKeyboardOnSearchLaunch() {
-        onView(allOf(hasFocus(), withTagKey(SearchFragment.SEARCH_TAG)))
+        onView(allOf(hasFocus(), withId(R.id.search_view)))
                 .check(matches(withClassName(containsString(SearchView.class.getName()))));
     }
 }
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index b448433..ae0102f 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -8,7 +8,7 @@
 
 # Include the testing libraries (JUnit4 + Robolectric libs).
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    platform-system-robolectric \
+    mockito-robolectric-prebuilt \
     truth-prebuilt
 
 LOCAL_JAVA_LIBRARIES := \
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index 767edf8..b9e328c 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -1,12 +1,15 @@
-com.android.settings.language.LanguageAndRegionSettings
+com.android.settings.bluetooth.DevicePickerFragment
+com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
+com.android.settings.bluetooth.BluetoothPairingDetail
 com.android.settings.notification.ZenModePrioritySettings
 com.android.settings.accounts.AccountDetailDashboardFragment
-com.android.settings.fuelgauge.PowerUsageDetail
+com.android.settings.fuelgauge.PowerUsageAnomalyDetails
 com.android.settings.fuelgauge.AdvancedPowerUsageDetail
 com.android.settings.deviceinfo.StorageProfileFragment
 com.android.settings.wifi.details.WifiNetworkDetailsFragment
+com.android.settings.wifi.p2p.WifiP2pSettings
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation
 com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone
 com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
-com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
\ No newline at end of file
+com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 0f65f89..47711b0 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -18,16 +18,12 @@
 com.android.settings.applications.ProcessStatsDetail
 com.android.settings.wifi.WifiInfo
 com.android.settings.applications.VrListenerSettings
-com.android.settings.nfc.PaymentSettings
-com.android.settings.inputmethod.VirtualKeyboardFragment
-com.android.settings.bluetooth.DevicePickerFragment
 com.android.settings.inputmethod.UserDictionaryList
 com.android.settings.deviceinfo.Status
 com.android.settings.datausage.DataSaverSummary
 com.android.settings.notification.ChannelNotificationSettings
 com.android.settings.datausage.AppDataUsage
 com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard
-com.android.settings.inputmethod.PhysicalKeyboardFragment
 com.android.settings.applications.ManageDomainUrls
 com.android.settings.applications.WriteSettingsDetails
 com.android.settings.location.LocationSettings
@@ -35,36 +31,28 @@
 com.android.settings.users.RestrictedProfileSettings
 com.android.settings.accounts.ChooseAccountActivity
 com.android.settings.accounts.ManagedProfileSettings
-com.android.settings.notification.ZenModeAutomationSettings
 com.android.settings.accessibility.ToggleAutoclickPreferenceFragment
 com.android.settings.applications.AppLaunchSettings
 com.android.settings.fuelgauge.BatterySaverSettings
 com.android.settings.location.ScanningSettings
 com.android.settings.tts.TextToSpeechSettings
 com.android.settings.applications.ProcessStatsUi
-com.android.settings.fuelgauge.PowerUsageDetail
 com.android.settings.notification.ZenModeScheduleRuleSettings
 com.android.settings.datausage.BillingCycleSettings
 com.android.settings.notification.NotificationStation
 com.android.settings.print.PrintJobSettingsFragment
-com.android.settings.applications.SpecialAccessSettings
 com.android.settings.accessibility.ToggleScreenReaderPreferenceFragmentForSetupWizard
 com.android.settings.accessibility.ToggleSelectToSpeakPreferenceFragmentForSetupWizard
 com.android.settings.accounts.AccountSyncSettings
 com.android.settings.notification.RedactionInterstitial$RedactionInterstitialFragment
 com.android.settings.inputmethod.InputMethodAndSubtypeEnabler
-com.android.settings.inputmethod.AvailableVirtualKeyboardFragment
 com.android.settings.applications.DrawOverlayDetails
-com.android.settings.tts.TtsEngineSettingsFragment
 com.android.settings.backup.ToggleBackupSettingFragment
 com.android.settings.users.UserDetailsSettings
 com.android.settings.datausage.UnrestrictedDataAccess
 com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard
 com.android.settings.fuelgauge.BatteryHistoryDetail
-com.android.settings.fuelgauge.PowerUsageSummary
 com.android.settings.applications.RunningServices
-com.android.settings.wifi.p2p.WifiP2pSettings
-com.android.settings.applications.assistant.ManageAssist
 com.android.settings.applications.ConfirmConvertToFbe
 com.android.settings.deviceinfo.PublicVolumeSettings
 com.android.settings.applications.InstalledAppDetails
@@ -78,17 +66,28 @@
 com.android.settings.deletionhelper.AutomaticStorageManagerSettings
 com.android.settings.notification.ZenAccessSettings
 com.android.settings.accessibility.ToggleFontSizePreferenceFragment
-com.android.settings.accessibility.ToggleGlobalGesturePreferenceFragment
-com.android.settings.wifi.ConfigureWifiSettings
 com.android.settings.applications.PremiumSmsAccess
 com.android.settings.applications.UsageAccessDetails
 com.android.settings.applications.AppStorageSettings
 com.android.settings.notification.NotificationAccessSettings
 com.android.settings.notification.ZenModeSettings
 com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment
-com.android.settings.applications.ConvertToFbe
 com.android.settings.localepicker.LocaleListEditor
 com.android.settings.qstile.DevelopmentTileConfigActivity$DevelopmentTileConfigFragment
 com.android.settings.applications.ExternalSourcesDetails
 com.android.settings.applications.PictureInPictureSettings
 com.android.settings.applications.PictureInPictureDetails
+com.android.settings.ApnSettings
+com.android.settings.SecuritySettings$SecuritySubSettings
+com.android.settings.PrivacySettings
+com.android.settings.WifiCallingSettings
+com.android.settings.password.SetupChooseLockGeneric$SetupChooseLockGenericFragment
+com.android.settings.SetupRedactionInterstitial$SetupRedactionInterstitialFragment
+com.android.settings.TrustAgentSettings
+com.android.settings.password.ChooseLockGeneric$ChooseLockGenericFragment
+com.android.settings.IccLockSettings
+com.android.settings.TetherSettings
+com.android.settings.ApplicationSettings
+com.android.settings.ApnEditor
+com.android.settings.UserCredentialsSettings
+com.android.settings.TestingSettings
diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/grandfather_not_implementing_instrumentable
index c1f0d60..64b5c83 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 a95fc0b..948b14a 100644
--- a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
+++ b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
@@ -1,2 +1 @@
 com.android.settings.display.ScreenZoomPreferenceFragmentForSetupWizard
-com.android.settings.print.PrintServiceSettingsFragment
diff --git a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider b/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
index 8184d2c..b329072 100644
--- a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
+++ b/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
@@ -1,5 +1 @@
-com.android.settings.language.LanguageAndInputSettings
-com.android.settings.enterprise.EnterprisePrivacySettings
-com.android.settings.applications.AdvancedAppSettings
 com.android.settings.fuelgauge.PowerUsageSummary
-com.android.settings.inputmethod.InputMethodAndLanguageSettings
diff --git a/tests/robotests/assets/whitelist_duplicate_index_key b/tests/robotests/assets/whitelist_duplicate_index_key
index 020957e..a761f35 100644
--- a/tests/robotests/assets/whitelist_duplicate_index_key
+++ b/tests/robotests/assets/whitelist_duplicate_index_key
@@ -2,4 +2,4 @@
 additional_system_update_settings
 dashboard_tile_placeholder
 screen_zoom
-usage_access
\ No newline at end of file
+usage_access
diff --git a/res/layout/account_type_preference.xml b/tests/robotests/res/drawable/selectable_card.xml
similarity index 63%
copy from res/layout/account_type_preference.xml
copy to tests/robotests/res/drawable/selectable_card.xml
index f7ba859..8d1274a 100644
--- a/res/layout/account_type_preference.xml
+++ b/tests/robotests/res/drawable/selectable_card.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!--
+     Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
      limitations under the License.
 -->
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/accountTypeIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <!-- Overlay this since Robolectric has trouble inflating ?android:attr/colorBackground -->
+    <item android:drawable="@android:color/transparent"/>
+</ripple>
\ No newline at end of file
diff --git a/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml b/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml
new file mode 100644
index 0000000..cedf5b9
--- /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 d63f7d6..156e20a 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 0000000..a461306
--- /dev/null
+++ b/tests/robotests/src/android/app/admin/PasswordMetrics.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.app.admin;
+
+import android.annotation.NonNull;
+
+/**
+ * Stub implementation of framework's PasswordMetrics for Robolectric tests. Otherwise Robolectric
+ * is throwing ClassNotFoundError.
+ *
+ * TODO: Remove this class when Robolectric supports O
+ */
+public class PasswordMetrics {
+
+    // Maximum allowed number of repeated or ordered characters in a sequence before we'll
+    // consider it a complex PIN/password.
+    public static final int MAX_ALLOWED_SEQUENCE = 3;
+
+    public int length = 0;
+    public int letters = 0;
+    public int upperCase = 0;
+    public int lowerCase = 0;
+    public int numeric = 0;
+    public int symbols = 0;
+    public int nonLetter = 0;
+
+    public static int maxLengthSequence(@NonNull String string) {
+        // Stub implementation
+        return 1;
+    }
+
+    public static PasswordMetrics computeForPassword(@NonNull String password) {
+        return new PasswordMetrics();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/android/service/oemlock/OemLockManager.java b/tests/robotests/src/android/service/oemlock/OemLockManager.java
new file mode 100644
index 0000000..7c015cf
--- /dev/null
+++ b/tests/robotests/src/android/service/oemlock/OemLockManager.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.service.oemlock;
+
+/**
+ * Make OemLockManager available to Robolectric.
+ */
+public class OemLockManager {
+    public void setOemUnlockAllowedByCarrier(boolean allowed, byte[] signature) {}
+
+    public boolean isOemUnlockAllowedByCarrier() {
+        return true;
+    }
+
+    public void setOemUnlockAllowedByUser(boolean allowed) {}
+
+    public boolean isOemUnlockAllowedByUser() {
+        return false;
+    }
+
+    public boolean canUserAllowOemUnlock() {
+        return true;
+    }
+    public boolean isOemUnlockAllowed() {
+        return false;
+    }
+
+    public boolean isDeviceOemUnlocked() {
+        return false;
+    }
+}
diff --git a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
index ffa6d96..3dcf6ab 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 @@
         return true;
     }
 
+    public boolean pulseOnPickupCanBeModified(int user) {
+        return true;
+    }
+
     public boolean pulseOnDoubleTapAvailable() {
         return true;
     }
@@ -42,4 +45,32 @@
     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/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
index 42aed2b..cd891be 100644
--- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
@@ -20,6 +20,7 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
index c64e582..51034dd 100644
--- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
@@ -28,6 +28,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.DeviceInfoUtils;
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index f0c87cf..6b895d7 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -1,8 +1,11 @@
 package com.android.settings;
 
 import android.content.Context;
+
 import com.android.settings.core.PreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.shadow.ShadowPowerManagerWrapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -13,13 +16,18 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.mock;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DisplaySettingsTest {
 
     @Test
+    @Config(shadows = ShadowPowerManagerWrapper.class)
     public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
         final Context context = RuntimeEnvironment.application;
+//        PowerManager wrapper = mock(PowerManager.class);
+//        doReturn(wrapper).when(context).getSystemService(Context.POWER_SERVICE);
         final DisplaySettings fragment = new DisplaySettings();
         final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
                 fragment.getPreferenceScreenResId());
diff --git a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
index 9a5002e..7a3875e 100644
--- a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
@@ -16,22 +16,110 @@
 
 package com.android.settings;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
+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 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 6cfe211..3d50c63 100644
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
@@ -17,6 +17,7 @@
 
 import android.content.Context;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +27,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
index ef36e5f..ea4b272 100644
--- a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
+++ b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
@@ -18,6 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.io.ByteArrayInputStream;
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
index 96e88c2..b16d315 100644
--- a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
@@ -23,13 +23,13 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import android.content.Context;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import java.io.File;
 import java.util.ArrayList;
-import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
index 721d0e0..21b8e47 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MasterClearTest.java
@@ -17,30 +17,74 @@
 package com.android.settings;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.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);
@@ -48,6 +92,37 @@
     }
 
     @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);
 
@@ -68,6 +143,22 @@
         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/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
index 4aac314..c52204d 100644
--- a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
@@ -30,6 +30,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PrivacySettingsTest {
diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
index e28a594..5838642 100644
--- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
@@ -30,6 +30,7 @@
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.notification.LockScreenNotificationPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
 import com.android.settingslib.drawer.DashboardCategory;
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index 65e9708..3fc46e8 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -16,17 +16,31 @@
 
 package com.android.settings;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-
 import android.os.Bundle;
 import android.view.Menu;
+
+import com.android.settings.search.SearchActivity;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,17 +49,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsActivityTest {
@@ -61,15 +67,10 @@
     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());
     }
@@ -89,27 +90,7 @@
     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
@@ -122,20 +103,13 @@
     }
 
     @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();
-    }
+        mActivity.onClick(null);
 
-    @Test
-    public void testRestoreState_EnabledHomeRestored() {
-        Bundle bundle = new Bundle();
-        bundle.putBoolean(SettingsActivity.SAVE_KEY_SHOW_SEARCH, true);
-        mActivity.onRestoreInstanceState(bundle);
-
-        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/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
index 9bf168d..942634a 100644
--- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
@@ -30,6 +30,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsDialogFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
index 043b0fe..0d0f22c 100644
--- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
@@ -34,6 +34,8 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsDumpServiceTest {
diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
index 3e28a2a..dd17d9c 100644
--- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
@@ -22,33 +22,25 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Application;
-import android.os.Bundle;
 import android.os.SystemProperties;
-import android.content.Context;
 import android.content.Intent;
-import android.content.Loader;
 import android.net.Uri;
-import android.os.Bundle;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.util.ActivityController;
-import org.robolectric.shadows.ShadowActivity;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
index cd48da3..dc4166d 100644
--- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -17,11 +17,13 @@
 package com.android.settings;
 
 
+import android.app.Activity;
 import android.content.Context;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
+import android.view.View;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,26 +32,46 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsPreferenceFragmentTest {
 
+    private static final int ITEM_COUNT = 5;
+
     @Mock
     private PreferenceManager mPreferenceManager;
+    @Mock
+    private Activity mActivity;
+    @Mock
+    private View mListContainer;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
     private Context mContext;
     private TestFragment mFragment;
+    private View mEmptyView;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mFragment = new TestFragment();
+        mFragment = spy(new TestFragment());
+        doReturn(mActivity).when(mFragment).getActivity();
+
+        mEmptyView = new View(mContext);
+        ReflectionHelpers.setField(mFragment, "mEmptyView", mEmptyView);
+
+        doReturn(ITEM_COUNT).when(mPreferenceScreen).getPreferenceCount();
     }
 
     @Test
@@ -100,7 +122,27 @@
         assertThat(mScreen.getPreferenceCount()).isEqualTo(1);
     }
 
-    public static final class TestFragment extends SettingsPreferenceFragment {
+    @Test
+    public void testUpdateEmptyView_containerInvisible_emptyViewVisible() {
+        doReturn(View.INVISIBLE).when(mListContainer).getVisibility();
+        doReturn(mListContainer).when(mActivity).findViewById(android.R.id.list_container);
+        doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
+
+        mFragment.updateEmptyView();
+
+        assertThat(mEmptyView.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void testUpdateEmptyView_containerNull_emptyViewGone() {
+        doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
+
+        mFragment.updateEmptyView();
+
+        assertThat(mEmptyView.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    public static class TestFragment extends SettingsPreferenceFragment {
 
         @Override
         public int getMetricsCategory() {
diff --git a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
index 4b78ee7..78bc7d1 100644
--- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
@@ -25,7 +25,10 @@
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 
-import com.android.settings.ChooseLockPattern.ChooseLockPatternFragment;
+import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
+import com.android.settings.password.ChooseLockPattern.IntentBuilder;
+import com.android.settings.password.SetupChooseLockPattern;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
@@ -63,11 +66,11 @@
 
         mActivity =  Robolectric.buildActivity(
                 SetupChooseLockPattern.class,
-                SetupChooseLockPattern.createIntent(
+                SetupChooseLockPattern.modifyIntentForSetup(
                         application,
-                        false, /* requirePassword */
-                        false, /* confirmCredentials */
-                        UserHandle.myUserId()))
+                        new IntentBuilder(application)
+                                .setUserId(UserHandle.myUserId())
+                                .build()))
                 .setup().get();
     }
 
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
index 1c83a1a..21061c1 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -16,22 +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.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
+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();
@@ -45,4 +58,24 @@
         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 4cf7e69..59a5867 100644
--- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
@@ -31,8 +31,15 @@
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class
+})
 public class SummaryPreferenceTest {
 
     private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/TetherServiceTest.java b/tests/robotests/src/com/android/settings/TetherServiceTest.java
index 2d5a2fb..0275c15 100644
--- a/tests/robotests/src/com/android/settings/TetherServiceTest.java
+++ b/tests/robotests/src/com/android/settings/TetherServiceTest.java
@@ -23,6 +23,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import java.util.ArrayList;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index 8dfd32a..93ab406 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -19,11 +19,12 @@
 import android.os.storage.DiskInfo;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
-import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.format.DateUtils;
 import android.text.style.TtsSpan;
 
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/ZonePickerTest.java b/tests/robotests/src/com/android/settings/ZonePickerTest.java
index 6ab0c2d..31606f1 100644
--- a/tests/robotests/src/com/android/settings/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/ZonePickerTest.java
@@ -26,6 +26,7 @@
 import android.widget.TextView;
 
 import com.android.settings.datetime.ZonePicker;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowLibcoreTimeZoneNames;
 import com.android.settings.testutils.shadow.ShadowTimeZoneNames;
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 4da06c0..01afdf8 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
index 9161f06..f2d1e65 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
@@ -21,7 +21,7 @@
 import android.os.UserManager;
 
 import android.test.mock.MockContentResolver;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -33,7 +33,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
index 90728e8..81b563f 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
@@ -17,17 +17,14 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowAccountManager;
-import com.android.settings.testutils.shadow.ShadowContentResolver;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.Tile;
 
@@ -41,11 +38,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -54,7 +47,6 @@
     private static final String METADATA_CATEGORY = "com.android.settings.category";
     private static final String METADATA_ACCOUNT_TYPE = "com.android.settings.ia.account";
     private static final String METADATA_USER_HANDLE = "user_handle";
-    private static final String PREF_ACCOUNT_HEADER = "account_header";
 
     @Mock(answer = RETURNS_DEEP_STUBS)
     private AccountManager mAccountManager;
@@ -118,20 +110,4 @@
 
         assertThat(mFragment.displayTile(tile)).isFalse();
     }
-
-    @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
-    public void updateAccountHeader_shouldShowAccountName() throws Exception {
-        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
-            new AuthenticatorDescription[0]);
-        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
-        when(mFragment.getContext()).thenReturn(mContext);
-        doReturn(mScreen).when(mFragment).getPreferenceScreen();
-        doReturn(mPreference).when(mFragment).findPreference(PREF_ACCOUNT_HEADER);
-
-        mFragment.updateUi();
-
-        verify(mPreference).setTitle("name1@abc.com");
-    }
-
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
new file mode 100644
index 0000000..4dce0c6
--- /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 f1ad142..f4f093a 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -20,6 +20,8 @@
 import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 import android.content.pm.UserInfo;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -31,11 +33,12 @@
 import com.android.settings.AccessiblePreferenceCategory;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
+import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,6 +47,8 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
@@ -211,12 +216,12 @@
         when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         mController.onResume();
 
         verify(preferenceGroup).setTitle(
-            mContext.getString(R.string.account_for_section_header, "user 1"));
+                mContext.getString(R.string.account_for_section_header, "user 1"));
 
     }
 
@@ -309,7 +314,7 @@
         when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
         when(mAccountHelper.hasBaseUserRestriction(
                 eq(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE), anyInt()))
-            .thenReturn(true);
+                .thenReturn(true);
 
         mController.updateRawDataToIndex(data);
 
@@ -324,7 +329,7 @@
         when(mUserManager.isManagedProfile()).thenReturn(false);
         when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
         when(mAccountHelper.hasBaseUserRestriction(
-            eq(UserManager.DISALLOW_MODIFY_ACCOUNTS), anyInt())).thenReturn(true);
+                eq(UserManager.DISALLOW_MODIFY_ACCOUNTS), anyInt())).thenReturn(true);
 
         mController.updateRawDataToIndex(data);
 
@@ -346,18 +351,18 @@
         accountType1[0] = new Account("Account11", "com.acct1");
         accountType1[1] = new Account("Account12", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         mController.onResume();
 
@@ -366,7 +371,8 @@
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
+    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class,
+            ShadowAuthenticatorHelper.class})
     public void onResume_twoAccountsOfSameName_shouldAddFivePreferences() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -425,25 +431,25 @@
         accountType1[0] = new Account("Acct11", "com.acct1");
         accountType1[1] = new Account("Acct12", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
         mController.onResume();
 
         mController.onResume();
 
         // each account should be added only once
-        verify(preferenceGroup).addPreference(argThat(new PreferenceMatcher("Acct11")));
-        verify(preferenceGroup).addPreference(argThat(new PreferenceMatcher("Acct12")));
+        verify(preferenceGroup).addPreference(argThat(titleMatches("Acct11")));
+        verify(preferenceGroup).addPreference(argThat(titleMatches("Acct12")));
     }
 
     @Test
@@ -460,18 +466,18 @@
         accountType1[0] = new Account("Acct11", "com.acct1");
         accountType1[1] = new Account("Acct12", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         mController.onResume();
 
@@ -481,14 +487,14 @@
         accountType1[1] = new Account("Acct12", "com.acct1");
         accountType1[2] = new Account("Acct13", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         mController.onResume();
 
         // each account should be added only once
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct11")));
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct12")));
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct13")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct11")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct12")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct13")));
     }
 
     @Test
@@ -504,7 +510,7 @@
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         // First time resume will build the UI with no account
         mController.onResume();
@@ -513,18 +519,18 @@
         Account[] accounts = {new Account("Acct1", "com.acct1")};
         when(mAccountManager.getAccountsAsUser(2)).thenReturn(accounts);
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accounts);
+                .thenReturn(accounts);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         // Resume should show the newly added account
         mController.onResume();
 
-        verify(preferenceGroup).addPreference(argThat(new PreferenceMatcher("Acct1")));
+        verify(preferenceGroup).addPreference(argThat(titleMatches("Acct1")));
     }
 
     @Test
@@ -542,18 +548,18 @@
         accountType1[0] = new Account("Acct11", "com.acct1");
         accountType1[1] = new Account("Acct12", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         AuthenticatorDescription[] authDescs = {
-            new AuthenticatorDescription("com.acct1", "com.android.settings",
-                R.string.account_settings_title, 0, 0, 0, false)
+                new AuthenticatorDescription("com.acct1", "com.android.settings",
+                        R.string.account_settings_title, 0, 0, 0, false)
         };
         when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
 
         AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
         when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
-            preferenceGroup);
+                preferenceGroup);
 
         mController.onResume();
 
@@ -561,29 +567,24 @@
         accountType1 = new Account[1];
         accountType1[0] = new Account("Acct11", "com.acct1");
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
-            .thenReturn(accountType1);
+                .thenReturn(accountType1);
 
         mController.onResume();
 
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct11")));
-        verify(preferenceGroup, times(1)).addPreference(argThat(new PreferenceMatcher("Acct12")));
-        verify(preferenceGroup, times(1)).removePreference(
-            argThat(new PreferenceMatcher("Acct12")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct11")));
+        verify(preferenceGroup, times(1)).addPreference(argThat(titleMatches("Acct12")));
+        verify(preferenceGroup, times(1)).removePreference(argThat(titleMatches("Acct12")));
     }
 
-    private static class PreferenceMatcher extends ArgumentMatcher<Preference> {
-
-        private final String mExpectedTitle;
-
-        public PreferenceMatcher(String title) {
-            mExpectedTitle = title;
-        }
-
-        @Override
-        public boolean matches(Object arg) {
-            final Preference preference = (Preference) arg;
-            return TextUtils.equals(mExpectedTitle, preference.getTitle());
-        }
+    private static ArgumentMatcher<Preference> titleMatches(String expected) {
+        return preference -> TextUtils.equals(expected, preference.getTitle());
     }
 
+    @Implements(AuthenticatorHelper.class)
+    public static class ShadowAuthenticatorHelper {
+        @Implementation
+        public Drawable getDrawableForType(Context context, final String accountType) {
+            return new ColorDrawable();
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
index eeca90b..0778043 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
index c159a24..5fbd3a7 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
@@ -16,41 +16,76 @@
 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;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.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");
+        mController.handlePreferenceTreeClick(mPreference);
 
-        final AccountSyncPreferenceController controller =
-                new AccountSyncPreferenceController(context);
-        controller.init(new Account("acct1", "type1"), mock(UserHandle.class));
-        controller.handlePreferenceTreeClick(preference);
-
-        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 @@
                 .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/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
index 29f254d..fff73b7 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
@@ -28,7 +28,7 @@
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
diff --git a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
index 755212d..38f6988 100644
--- a/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AddUserWhenLockedPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import com.android.settingslib.RestrictedSwitchPreference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
index f7dd7a3..b8ad837 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncDataPreferenceControllerTest.java
@@ -18,13 +18,12 @@
 import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.pm.UserInfo;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v14.preference.SwitchPreference;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import java.util.ArrayList;
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
index 6ac0eab..ab462c0 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncPersonalDataPreferenceControllerTest.java
@@ -21,9 +21,8 @@
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search.SearchIndexableRaw;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
index cd66d5e..a25aa28 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
@@ -17,10 +17,8 @@
 package com.android.settings.accounts;
 
 
-import static android.content.pm.UserInfo.FLAG_MANAGED_PROFILE;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
 
@@ -30,7 +28,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
index 10bb283..0f7de46 100644
--- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
@@ -149,6 +149,6 @@
         mController.handlePreferenceTreeClick(preference);
 
         assertThat(application.getNextStartedActivity().getAction())
-                .isEqualTo("android.settings.EDIT_EMERGENGY_INFO");
+                .isEqualTo("android.settings.EDIT_EMERGENCY_INFO");
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index 033465b..93b5253 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -15,6 +15,16 @@
  */
 package com.android.settings.accounts;
 
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
@@ -26,17 +36,14 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
-import android.support.v7.preference.PreferenceScreen;
 import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
 import android.widget.Button;
 
-import com.android.settings.AccessiblePreferenceCategory;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
 
@@ -48,16 +55,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class RemoveAccountPreferenceControllerTest {
@@ -134,7 +131,7 @@
                     mFragment, account, userHandle);
         dialog.onCreate(new Bundle());
         dialog.onClick(null, 0);
-        verify(mAccountManager).removeAccountAsUser(eq(account), any(Activity.class),
-            any(AccountManagerCallback.class), any(Handler.class), eq(userHandle));
+        verify(mAccountManager).removeAccountAsUser(eq(account), nullable(Activity.class),
+            nullable(AccountManagerCallback.class), nullable(Handler.class), eq(userHandle));
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
index 965b6dc..cd73068 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.accounts;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java
index 0c3c160..968421b 100644
--- a/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java
@@ -17,16 +17,19 @@
 package com.android.settings.applications;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserManager;
+import android.telephony.TelephonyManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
 import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.testutils.XmlTestUtils;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,8 +41,10 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -73,18 +78,18 @@
     public void setListening_shouldUpdateSummary() {
         final SummaryLoader summaryLoader = mock(SummaryLoader.class);
         final AdvancedAppSettings.SummaryProvider summaryProvider =
-            new AdvancedAppSettings.SummaryProvider(mContext, summaryLoader);
+                new AdvancedAppSettings.SummaryProvider(mContext, summaryLoader);
         final DefaultSmsPreferenceController defaultSms =
-            mock(DefaultSmsPreferenceController.class);
+                mock(DefaultSmsPreferenceController.class);
         final DefaultBrowserPreferenceController defaultBrowser =
-            mock(DefaultBrowserPreferenceController.class);
+                mock(DefaultBrowserPreferenceController.class);
         final DefaultPhonePreferenceController defaultPhone =
-            mock(DefaultPhonePreferenceController.class);
+                mock(DefaultPhonePreferenceController.class);
         ReflectionHelpers.setField(summaryProvider, "mDefaultSmsPreferenceController", defaultSms);
         ReflectionHelpers.setField(
-            summaryProvider, "mDefaultBrowserPreferenceController", defaultBrowser);
+                summaryProvider, "mDefaultBrowserPreferenceController", defaultBrowser);
         ReflectionHelpers.setField(
-            summaryProvider, "mDefaultPhonePreferenceController", defaultPhone);
+                summaryProvider, "mDefaultPhonePreferenceController", defaultPhone);
 
         // all available
         when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1");
@@ -140,12 +145,23 @@
 
     }
 
-
     @Test
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
+        final Context mockContext = mock(Context.class);
+        final UserManager userManager = mock(UserManager.class, RETURNS_DEEP_STUBS);
+
+        when(mockContext.getSystemService(Context.USER_SERVICE))
+                .thenReturn(userManager);
+        when(userManager.getUserInfo(anyInt()).isRestricted()).thenReturn(true);
+
+        when(mockContext.getSystemService(Context.TELEPHONY_SERVICE))
+                .thenReturn(mock(TelephonyManager.class));
+        when(mockContext.getPackageManager())
+                .thenReturn(mock(PackageManager.class));
         final List<String> niks = AdvancedAppSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
+                .getNonIndexableKeys(mockContext);
+
         final int xmlId = (new AdvancedAppSettings()).getPreferenceScreenResId();
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
index 32b447a..697d04f 100644
--- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import android.os.UserManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 
diff --git a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
deleted file mode 100644
index 8b9b4b4..0000000
--- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.applications;
-
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.os.UserHandle;
-import android.support.v7.preference.Preference;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AppHeaderControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Activity mActivity;
-    @Mock
-    private Fragment mFragment;
-
-    private Context mShadowContext;
-    private LayoutInflater mLayoutInflater;
-    private PackageInfo mInfo;
-    private AppHeaderController mController;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mShadowContext = RuntimeEnvironment.application;
-        when(mFragment.getContext()).thenReturn(mShadowContext);
-        mLayoutInflater = LayoutInflater.from(mShadowContext);
-        mInfo = new PackageInfo();
-        mInfo.versionName = "1234";
-    }
-
-    @Test
-    public void testBuildView_constructedWithoutView_shouldCreateNewView() {
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
-        View view = mController.done(mActivity);
-
-        assertThat(view).isNotNull();
-    }
-
-    @Test
-    public void testBuildView_withContext_shouldBuildPreference() {
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
-        Preference preference = mController.done(mActivity, mShadowContext);
-
-        assertThat(preference instanceof LayoutPreference).isTrue();
-    }
-
-    @Test
-    public void testBuildView_constructedWithView_shouldReturnSameView() {
-        View inputView = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        mController = new AppHeaderController(mShadowContext, mFragment, inputView);
-        View view = mController.done(mActivity);
-
-        assertThat(view).isSameAs(inputView);
-    }
-
-    @Test
-    public void bindViews_shouldBindAllData() {
-        final String testString = "test";
-        final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        final TextView label = appHeader.findViewById(R.id.app_detail_title);
-        final TextView version = appHeader.findViewById(R.id.app_detail_summary);
-
-        mController = new AppHeaderController(mShadowContext, mFragment, appHeader);
-        mController.setLabel(testString);
-        mController.setSummary(testString);
-        mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
-        mController.done(mActivity);
-
-        assertThat(label.getText()).isEqualTo(testString);
-        assertThat(version.getText()).isEqualTo(testString);
-    }
-
-    @Test
-    public void bindButton_hasAppPref_shouldShowButton() {
-        final ResolveInfo info = new ResolveInfo();
-        info.activityInfo = new ActivityInfo();
-        info.activityInfo.packageName = "123";
-        info.activityInfo.name = "321";
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-                .thenReturn(info);
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setButtonActions(
-                AppHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                AppHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-        try {
-            appLinks.findViewById(R.id.left_button).performClick();
-        } catch (Exception e) {
-            // Ignore exception because the launching intent is fake.
-        }
-        verify(mFragment).startActivity(any(Intent.class));
-    }
-
-    @Test
-    public void bindButton_noAppPref_shouldNotShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
-                .thenReturn(null);
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setButtonActions(
-                AppHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                AppHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.GONE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void bindButton_noAppInfo_shouldNotShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setPackageName(null)
-                .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.GONE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void bindButton_hasAppInfo_shouldShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setPackageName("123")
-                .setUid(UserHandle.USER_SYSTEM)
-                .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void bindButton_hasAppInfo_shouldHaveContentDescription() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
-        when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setPackageName("123")
-                .setUid(UserHandle.USER_SYSTEM)
-                .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getContentDescription())
-                .isEqualTo("App Info");
-    }
-
-    @Test
-    public void bindButton_hasAppNotifIntent_shouldShowButton() {
-        final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
-
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
-        mController.setAppNotifPrefIntent(new Intent())
-                .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
-                        AppHeaderController.ActionType.ACTION_NONE);
-        mController.done(mActivity);
-
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
-                .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    // Ensure that the instant app label does not show up when we haven't told the controller the
-    // app is instant.
-    @Test
-    public void instantApps_normalAppsDontGetLabel() {
-        final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        mController = new AppHeaderController(mContext, mFragment, appHeader);
-        mController.done(mActivity);
-        assertThat(appHeader.findViewById(R.id.install_type).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    // Test that the "instant apps" label is present in the header when we have an instant app.
-    @Test
-    public void instantApps_expectedHeaderItem() {
-        final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        mController = new AppHeaderController(mContext, mFragment, appHeader);
-        mController.setIsInstantApp(true);
-        mController.done(mActivity);
-        TextView label = appHeader.findViewById(R.id.install_type);
-        assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(label.getText()).isEqualTo(
-                appHeader.getResources().getString(R.string.install_type_instant));
-        assertThat(appHeader.findViewById(R.id.app_detail_summary).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void styleActionBar_invalidObjects_shouldNotCrash() {
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
-        mController.styleActionBar(null);
-
-        when(mActivity.getActionBar()).thenReturn(null);
-        mController.styleActionBar(mActivity);
-
-        verify(mActivity).getActionBar();
-    }
-
-    @Test
-    public void styleActionBar_setElevationAndBackground() {
-        final ActionBar actionBar = mActivity.getActionBar();
-
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
-        mController.styleActionBar(mActivity);
-
-        verify(actionBar).setElevation(0);
-        // Enforce a color drawable as background here, as image based drawables might not be
-        // wide enough to cover entire action bar.
-        verify(actionBar).setBackgroundDrawable(any(ColorDrawable.class));
-    }
-
-    @Test
-    public void initAppHeaderController_appHeaderNull_useFragmentContext() {
-        mController = new AppHeaderController(mContext, mFragment, null);
-
-        // Fragment.getContext() is invoked to inflate the view
-        verify(mFragment).getContext();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
index 68c153c..62395f3 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.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 @@
         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 @@
             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 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 0000000..e19c52f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionGroupInfo;
+import android.content.pm.PermissionInfo;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AppPermissionsPreferenceControllerTest {
+
+    private static final String PERM_LOCATION = "android.permission-group.LOCATION";
+    private static final String PERM_MICROPHONE = "android.permission-group.MICROPHONE";
+    private static final String PERM_CAMERA = "android.permission-group.CAMERA";
+    private static final String PERM_SMS = "android.permission-group.SMS";
+    private static final String PERM_CONTACTS = "android.permission-group.CONTACTS";
+    private static final String PERM_PHONE = "android.permission-group.PHONE";
+    private static final String LABEL_LOCATION = "Location";
+    private static final String LABEL_MICROPHONE = "Microphone";
+    private static final String LABEL_CAMERA = "Camera";
+    private static final String LABEL_SMS = "Sms";
+    private static final String LABEL_CONTACTS = "Contacts";
+    private static final String LABEL_PHONE = "Phone";
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private PermissionGroupInfo mGroupLocation;
+    @Mock
+    private PermissionGroupInfo mGroupMic;
+    @Mock
+    private PermissionGroupInfo mGroupCamera;
+    @Mock
+    private PermissionGroupInfo mGroupSms;
+    @Mock
+    private PermissionGroupInfo mGroupContacts;
+    @Mock
+    private PermissionGroupInfo mGroupPhone;
+
+    private Context mContext;
+    private AppPermissionsPreferenceController mController;
+    private PermissionInfo mPermLocation;
+    private PermissionInfo mPermMic;
+    private PermissionInfo mPermCamera;
+    private PermissionInfo mPermSms;
+    private PermissionInfo mPermContacts;
+    private PermissionInfo mPermPhone;
+
+    @Before
+    public void setUp() throws NameNotFoundException {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        // create permission groups
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_LOCATION), anyInt()))
+            .thenReturn(mGroupLocation);
+        when(mGroupLocation.loadLabel(mPackageManager)).thenReturn(LABEL_LOCATION);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_MICROPHONE), anyInt()))
+            .thenReturn(mGroupMic);
+        when(mGroupMic.loadLabel(mPackageManager)).thenReturn(LABEL_MICROPHONE);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_CAMERA), anyInt()))
+            .thenReturn(mGroupCamera);
+        when(mGroupCamera.loadLabel(mPackageManager)).thenReturn(LABEL_CAMERA);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_SMS), anyInt())).thenReturn(mGroupSms);
+        when(mGroupSms.loadLabel(mPackageManager)).thenReturn(LABEL_SMS);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_CONTACTS), anyInt()))
+            .thenReturn(mGroupContacts);
+        when(mGroupContacts.loadLabel(mPackageManager)).thenReturn(LABEL_CONTACTS);
+        when(mPackageManager.getPermissionGroupInfo(eq(PERM_PHONE), anyInt()))
+            .thenReturn(mGroupPhone);
+        when(mGroupPhone.loadLabel(mPackageManager)).thenReturn(LABEL_PHONE);
+
+        // create permissions
+        mPermLocation = new PermissionInfo();
+        mPermLocation.name = "Permission1";
+        mPermLocation.group = PERM_LOCATION;
+        mPermMic = new PermissionInfo();
+        mPermMic.name = "Permission2";
+        mPermMic.group = PERM_MICROPHONE;
+        mPermCamera = new PermissionInfo();
+        mPermCamera.name = "Permission3";
+        mPermCamera.group = PERM_CAMERA;
+        mPermSms = new PermissionInfo();
+        mPermSms.name = "Permission4";
+        mPermSms.group = PERM_SMS;
+        mPermContacts = new PermissionInfo();
+        mPermContacts.name = "Permission4";
+        mPermContacts.group = PERM_CONTACTS;
+        mPermPhone = new PermissionInfo();
+        mPermPhone.name = "Permission4";
+        mPermPhone.group = PERM_PHONE;
+        final List<PermissionInfo> permissions = new ArrayList<>();
+        permissions.add(mPermLocation);
+        permissions.add(mPermMic);
+        permissions.add(mPermCamera);
+        permissions.add(mPermSms);
+        permissions.add(mPermContacts);
+        permissions.add(mPermPhone);
+        when(mPackageManager.queryPermissionsByGroup(anyString(), anyInt()))
+            .thenReturn(permissions);
+
+        mController = spy(new AppPermissionsPreferenceController(mContext));
+    }
+
+    @Test
+    public void isAvailable_shouldAlwaysReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_noGrantedPermissions_shouldNotSetSummary() {
+        final List<PackageInfo> installedPackages = new ArrayList<>();
+        final PackageInfo info = new PackageInfo();
+        installedPackages.add(info);
+        when(mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS))
+            .thenReturn(installedPackages);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference, never()).setSummary(anyString());
+    }
+
+    @Test
+    public void updateState_hasPermissions_shouldSetSummary() {
+        final List<PackageInfo> installedPackages = new ArrayList<>();
+        final PackageInfo info = new PackageInfo();
+        installedPackages.add(info);
+        when(mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS))
+            .thenReturn(installedPackages);
+        PermissionInfo[] permissions = new PermissionInfo[4];
+        info.permissions = permissions;
+
+        permissions[0] = mPermLocation;
+        permissions[1] = mPermMic;
+        permissions[2] = mPermCamera;
+        permissions[3] = mPermSms;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Location, Microphone, Camera");
+
+        permissions[0] = mPermPhone;
+        permissions[1] = mPermMic;
+        permissions[2] = mPermCamera;
+        permissions[3] = mPermSms;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Microphone, Camera, Sms");
+
+        permissions[0] = mPermPhone;
+        permissions[1] = mPermMic;
+        permissions[2] = mPermContacts;
+        permissions[3] = mPermSms;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Microphone, Sms, Contacts");
+
+        permissions = new PermissionInfo[2];
+        info.permissions = permissions;
+        permissions[0] = mPermLocation;
+        permissions[1] = mPermCamera;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Location, Camera");
+
+        permissions = new PermissionInfo[1];
+        info.permissions = permissions;
+        permissions[0] = mPermCamera;
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("Apps using Camera");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
index f17509a..df226a8 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
@@ -25,7 +25,7 @@
 import android.content.Context;
 import android.os.RemoteException;
 import android.os.UserManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
index 3076080..62623e5 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
@@ -20,8 +20,7 @@
 
 import android.app.AppOpsManager;
 
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
index e302edd..8145b40 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
@@ -8,7 +8,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index 4a7dc8f..11401a8 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -26,7 +26,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
index 73bba04..c3c1bb3 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
@@ -23,7 +23,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 672c5b7..2b1c296 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -28,7 +28,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.ApplicationTestUtils;
diff --git a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
index ef6351a..6122576 100644
--- a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.nullable;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.TouchOverlayManager;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -35,10 +39,6 @@
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DrawOverlayDetailsTest {
@@ -66,11 +66,11 @@
     public void logSpecialPermissionChange() {
         mFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_DENY), eq("app"));
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
index ad05c27..10caf13 100644
--- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.applications;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
index 36116c0..3269acb 100644
--- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -27,7 +28,7 @@
 import android.content.pm.ApplicationInfo;
 import android.os.UserHandle;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -63,7 +64,8 @@
         when(stats.getCodeBytes()).thenReturn(1L);
         when(stats.getDataBytes()).thenReturn(2L);
         when(stats.getCacheBytes()).thenReturn(3L);
-        when(mSource.getStatsForPackage(anyString(), anyString(), any(UserHandle.class)))
+        when(mSource.getStatsForPackage(nullable(String.class), nullable(String.class),
+                any(UserHandle.class)))
                 .thenReturn(stats);
         ApplicationInfo info = new ApplicationInfo();
         info.packageName = PACKAGE_NAME;
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
index 37fa9d7..56df10e 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
@@ -16,17 +16,29 @@
 
 package com.android.settings.applications;
 
+import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
-import android.os.Build;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 
@@ -41,20 +53,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
+import java.util.Collections;
 import java.util.Set;
 
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
 /**
  * Tests for {@link InstalledAppCounter}.
  */
@@ -113,11 +114,12 @@
 
     private void expectQueryIntentActivities(int userId, String packageName, boolean launchable) {
         when(mPackageManager.queryIntentActivitiesAsUser(
-                argThat(new IsLaunchIntentFor(packageName)),
+                argThat(isLaunchIntentFor(packageName)),
                 eq(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.MATCH_DIRECT_BOOT_AWARE
                         | PackageManager.MATCH_DIRECT_BOOT_UNAWARE),
-                eq(userId))).thenReturn(launchable ? Arrays.asList(new ResolveInfo())
-                : new ArrayList<ResolveInfo>());
+                eq(userId))).thenReturn(launchable
+                        ? Collections.singletonList(new ResolveInfo())
+                        : new ArrayList<>());
     }
 
     private void testCountInstalledAppsAcrossAllUsers(boolean async) {
@@ -136,7 +138,7 @@
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
         verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
                 eq(MANAGED_PROFILE_ID));
-        verify(mPackageManager, atLeast(0)).queryIntentActivitiesAsUser(anyObject(), anyInt(),
+        verify(mPackageManager, atLeast(0)).queryIntentActivitiesAsUser(any(Intent.class), anyInt(),
                 anyInt());
         verifyNoMoreInteractions(mPackageManager);
 
@@ -251,16 +253,8 @@
         }
     }
 
-    private static class IsLaunchIntentFor extends ArgumentMatcher<Intent> {
-        private final String mPackageName;
-
-        IsLaunchIntentFor(String packageName) {
-            mPackageName = packageName;
-        }
-
-        @Override
-        public boolean matches(Object i) {
-            final Intent intent = (Intent) i;
+    private ArgumentMatcher<Intent> isLaunchIntentFor(String packageName) {
+        return intent -> {
             if (intent == null) {
                 return false;
             }
@@ -272,10 +266,10 @@
                     !categories.contains(Intent.CATEGORY_LAUNCHER)) {
                 return false;
             }
-            if (!mPackageName.equals(intent.getPackage())) {
+            if (!packageName.equals(intent.getPackage())) {
                 return false;
             }
             return true;
-        }
+        };
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index 2fbad13..e20a435 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;
@@ -38,9 +41,10 @@
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.instantapps.InstantAppButtonsController;
+import com.android.settings.applications.instantapps.InstantAppButtonsController.ShowDialogDelegate;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.Utils;
@@ -66,10 +70,9 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.anyDouble;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -111,6 +114,8 @@
     private BatteryUtils mBatteryUtils;
     @Mock
     private LoaderManager mLoaderManager;
+    @Mock
+    private AppOpsManager mAppOpsManager;
 
     private FakeFeatureFactory mFeatureFactory;
     private InstalledAppDetails mAppDetail;
@@ -121,8 +126,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
         mShadowContext = RuntimeEnvironment.application;
         mAppDetail = spy(new InstalledAppDetails());
         mAppDetail.mBatteryUtils = mBatteryUtils;
@@ -137,6 +141,7 @@
         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 @@
 
     @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 @@
 
     @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 @@
         // 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 @@
 
         final InstantAppButtonsController buttonsController =
                 mock(InstantAppButtonsController.class);
-        when(buttonsController.setPackageName(anyString())).thenReturn(buttonsController);
-
+        when(buttonsController.setPackageName(nullable(String.class)))
+                .thenReturn(buttonsController);
         when(mFeatureFactory.applicationFeatureProvider.newInstantAppButtonsController(
-                any(), any(), any())).thenReturn(buttonsController);
+                nullable(Fragment.class), nullable(View.class), nullable(ShowDialogDelegate.class)))
+                .thenReturn(buttonsController);
 
         fragment.maybeAddInstantAppButtons();
-        verify(buttonsController).setPackageName(anyString());
+        verify(buttonsController).setPackageName(nullable(String.class));
         verify(buttonsController).show();
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
index 76421c2..c4c3259 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
@@ -24,7 +24,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -36,7 +36,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -51,7 +50,6 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 /**
@@ -87,11 +85,12 @@
 
     private void expectQueryIntentActivities(int userId, String packageName, boolean launchable) {
         when(mPackageManager.queryIntentActivitiesAsUser(
-                argThat(new IsLaunchIntentFor(packageName)),
+                argThat(isLaunchIntentFor(packageName)),
                 eq(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.MATCH_DIRECT_BOOT_AWARE
                         | PackageManager.MATCH_DIRECT_BOOT_UNAWARE),
-                eq(userId))).thenReturn(launchable ? Arrays.asList(new ResolveInfo())
-                        : new ArrayList<ResolveInfo>());
+                eq(userId))).thenReturn(launchable
+                        ? Collections.singletonList(new ResolveInfo())
+                        : Collections.emptyList());
     }
 
     @Test
@@ -203,16 +202,8 @@
         }
     }
 
-    private static class IsLaunchIntentFor extends ArgumentMatcher<Intent> {
-        private final String mPackageName;
-
-        IsLaunchIntentFor(String packageName) {
-            mPackageName = packageName;
-        }
-
-        @Override
-        public boolean matches(Object i) {
-            final Intent intent = (Intent) i;
+    private static ArgumentMatcher<Intent> isLaunchIntentFor(String packageName) {
+        return intent -> {
             if (intent == null) {
                 return false;
             }
@@ -224,10 +215,10 @@
                     !categories.contains(Intent.CATEGORY_LAUNCHER)) {
                 return false;
             }
-            if (!mPackageName.equals(intent.getPackage())) {
+            if (!packageName.equals(intent.getPackage())) {
                 return false;
             }
             return true;
-        }
+        };
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
index 04d4342..699c0db 100644
--- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
@@ -27,7 +27,7 @@
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
index 871b5a0..52c1069 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.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 @@
         })
 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 @@
         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 779e0b6..5df5bed 100644
--- a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
@@ -18,7 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.nullable;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -30,10 +30,10 @@
 import android.provider.DocumentsContract;
 import android.view.LayoutInflater;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -82,7 +82,7 @@
 
     @Test
     public void storageShouldRepresentStorageStatsQuery() throws Exception {
-        when(mSource.getExternalStorageStats(any(String.class), any(UserHandle.class))).thenReturn(
+        when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class))).thenReturn(
                 new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0, 0));
 
         mController.queryStats();
diff --git a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java
new file mode 100644
index 0000000..1635576
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.Context;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.UserInfo;
+import android.os.UserManager;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.notification.NotificationBackend;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class NotificationAppsTest {
+
+    @Mock
+    private PackageManagerWrapper mPackageManager;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private SummaryLoader mSummaryLoader;
+    @Mock
+    private NotificationBackend mBackend;
+
+    private Context mContext;
+    private NotificationApps.SummaryProvider mSummaryProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager);
+        mContext = shadowApplication.getApplicationContext();
+        mSummaryProvider = spy(new NotificationApps.SummaryProvider(mContext, mSummaryLoader));
+        ReflectionHelpers.setField(mSummaryProvider, "mNotificationBackend", mBackend);
+        ReflectionHelpers.setField(mSummaryProvider, "mPackageManager", mPackageManager);
+    }
+
+    @Test
+    public void setListening_shouldSetSummary() {
+        List<UserInfo> userInfos = new ArrayList<>();
+        userInfos.add(new UserInfo(1, "user1", 0));
+        when(mUserManager.getProfiles(anyInt())).thenReturn(userInfos);
+        List<ApplicationInfo> appInfos = new ArrayList<>();
+        ApplicationInfo info1 = new ApplicationInfo();
+        info1.packageName = "package1";
+        appInfos.add(info1);
+        ApplicationInfo info2 = new ApplicationInfo();
+        info2.packageName = "package2";
+        appInfos.add(info2);
+        when(mPackageManager.getInstalledApplicationsAsUser(anyInt(), anyInt()))
+            .thenReturn(appInfos);
+
+        // no notification off
+        when(mBackend.getNotificationsBanned(anyString(), anyInt())).thenReturn(false);
+        mSummaryProvider.setListening(true);
+        ShadowApplication.runBackgroundTasks();
+        verify(mSummaryLoader).setSummary(mSummaryProvider,
+            mContext.getString(R.string.notification_summary_none));
+
+        // some notification off
+        when(mBackend.getNotificationsBanned(eq("package1"), anyInt())).thenReturn(true);
+        mSummaryProvider.setListening(true);
+        ShadowApplication.runBackgroundTasks();
+        verify(mSummaryLoader).setSummary(mSummaryProvider,
+            mContext.getResources().getQuantityString(R.plurals.notification_summary, 1, 1));
+
+        when(mBackend.getNotificationsBanned(eq("package2"), anyInt())).thenReturn(true);
+        mSummaryProvider.setListening(true);
+        ShadowApplication.runBackgroundTasks();
+        verify(mSummaryLoader).setSummary(mSummaryProvider,
+            mContext.getResources().getQuantityString(R.plurals.notification_summary, 2, 2));
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
index 96a10f1..6bac9a3 100644
--- a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
@@ -16,10 +16,16 @@
 
 package com.android.settings.applications;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -30,12 +36,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -83,11 +83,11 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_PICTURE_IN_PICTURE_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_PICTURE_IN_PICTURE_DENY), eq("app"));
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
index d9c88ff..30ebcde 100644
--- a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
@@ -16,11 +16,15 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.telephony.SmsUsageMonitor;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -33,10 +37,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PremiumSmsAccessTest {
@@ -60,17 +60,17 @@
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER,
                 "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK), eq("app"));
 
         mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW,
                 "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY), eq("app"));
 
         mFragment.logSpecialPermissionChange(SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW,
                 "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW),
                 eq("app"));
     }
diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
new file mode 100644
index 0000000..4403991
--- /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/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index 44ca9f7..f17addd 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.datausage.DataSaverBackend;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
index 532a923..229057f 100644
--- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -32,10 +36,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UsageAccessDetailsTest {
@@ -58,11 +58,11 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY), eq("app"));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
index 3abe3f4..d2f1bbd 100644
--- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -31,10 +35,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class VrListenerSettingsTest {
@@ -56,11 +56,11 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_VRHELPER_DENY), eq("app"));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
index a632118..a995394 100644
--- a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.applications;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -31,10 +35,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WriteSettingsDetailsTest {
@@ -56,12 +56,12 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW),
                 eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY),
                 eq("app"));
     }
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
index da8473f..6c8ad9b 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
@@ -22,9 +22,9 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
index 0b2378c..7fa11cf 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -23,10 +23,10 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
index abc030b..f0956c7 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
@@ -19,7 +19,7 @@
 
 import android.net.Uri;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
index aca11a6..52916f5 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
index 728a8a5..037bd10 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -28,7 +28,7 @@
 import android.content.pm.ServiceInfo;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
index 91d4b51..1b4fb09 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
@@ -18,7 +18,7 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
index 4501a98..281e70a 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java
@@ -25,7 +25,7 @@
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
index 2d9ae9b..66ec80a 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
@@ -17,18 +17,16 @@
 package com.android.settings.applications.defaultapps;
 
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
 import android.app.Activity;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.PreferenceScreen;
+import android.util.Pair;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.widget.RadioButtonPreference;
 
 import org.junit.Before;
@@ -43,6 +41,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DefaultAppPickerFragmentTest {
@@ -54,11 +59,13 @@
     @Mock
     private UserManager mUserManager;
 
+    private FakeFeatureFactory mFeatureFactory;
     private TestFragment mFragment;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mActivity);
         mFragment = spy(new TestFragment());
 
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
@@ -68,6 +75,7 @@
 
     @Test
     public void clickPreference_hasConfirmation_shouldShowConfirmation() {
+        mFragment.onAttach((Context) mActivity);
         final RadioButtonPreference pref =
                 new RadioButtonPreference(RuntimeEnvironment.application);
         pref.setKey("TEST");
@@ -78,6 +86,17 @@
         mFragment.onRadioButtonClicked(pref);
     }
 
+    @Test
+    public void onRadioButtonConfirmed_shouldLog() {
+        mFragment.onAttach((Context) mActivity);
+        mFragment.onRadioButtonConfirmed("test_pkg");
+
+        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+                eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_UPDATE_DEFAULT_APP),
+                eq("test_pkg"),
+                any(Pair.class));
+    }
+
     public static class TestFragment extends DefaultAppPickerFragment {
 
         boolean setDefaultAppKeyCalled;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
index fc000c9..120f3ae 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
@@ -26,7 +26,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
index f564755..655f693 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -27,7 +27,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
index a7912c4..d6f1122 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
@@ -25,7 +25,7 @@
 import android.view.autofill.AutofillManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.AutofillManagerWrapper;
 import com.android.settings.applications.PackageManagerWrapper;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
index 63d8c6d..f5dc72d 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
index ee2cd1d..e918ee2 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
index 6ee9e86..04972ae 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
@@ -21,7 +21,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
index f425d2f..b500637 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
@@ -29,7 +29,7 @@
 import android.os.Build;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
index 6d6e2f8..d7e5192 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
@@ -17,11 +17,12 @@
 package com.android.settings.applications.defaultapps;
 
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
@@ -84,4 +85,33 @@
 
         verify(mPackageManager).getHomeActivities(anyList());
     }
+
+    @Test
+    public void testIsHomeDefault_noDefaultSet_shouldReturnTrue() {
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(null);
+        assertThat(DefaultHomePreferenceController.isHomeDefault("test.pkg", mPackageManager))
+                .isTrue();
+    }
+
+    @Test
+    public void testIsHomeDefault_defaultSetToPkg_shouldReturnTrue() {
+        final String pkgName = "test.pkg";
+        final ComponentName defaultHome = new ComponentName(pkgName, "class");
+
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(defaultHome);
+
+        assertThat(DefaultHomePreferenceController.isHomeDefault(pkgName, mPackageManager))
+                .isTrue();
+    }
+
+    @Test
+    public void testIsHomeDefault_defaultSetToOtherPkg_shouldReturnFalse() {
+        final String pkgName = "test.pkg";
+        final ComponentName defaultHome = new ComponentName("not" + pkgName, "class");
+
+        when(mPackageManager.getHomeActivities(anyList())).thenReturn(defaultHome);
+
+        assertThat(DefaultHomePreferenceController.isHomeDefault(pkgName, mPackageManager))
+                .isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java
index acf90d5..a60b43c 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultNotificationAssistantPickerTest.java
@@ -22,7 +22,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
index 0318a97..600acb4 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
index ba19d83..da0c325 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 
diff --git a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
index 13040a2..9e190b5 100644
--- a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
@@ -44,10 +44,9 @@
 import android.widget.Button;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.backup.BackupSettingsActivityTest;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -58,7 +57,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowUserManager;
 import org.robolectric.util.ReflectionHelpers;
 
 /** Tests for the InstantAppButtonsController. */
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
index a58b67d..5fc3ebc 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
@@ -23,17 +23,15 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.accounts.AccountManager;
 import android.app.backup.BackupManager;
 import android.content.Context;
-import android.content.Intent;
 import android.os.RemoteException;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
index ae67b04..69c8a03 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
@@ -32,7 +32,7 @@
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchIndexableRaw;
 
@@ -50,7 +50,6 @@
 import org.robolectric.annotation.Resetter;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.util.ActivityController;
-import org.robolectric.shadows.ShadowActivity;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
index 0205124..9de0c6a 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
@@ -45,7 +45,7 @@
 import static org.mockito.Mockito.when;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
index 7157862..3ad49e7 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.backup;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
new file mode 100644
index 0000000..fd46b4b
--- /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 0000000..7af2b85
--- /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 0000000..240ece1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows=SettingsShadowBluetoothDevice.class)
+public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase {
+
+    static class TestController extends BluetoothDetailsController {
+        public TestController(Context context, PreferenceFragment fragment,
+                CachedBluetoothDevice device,
+                Lifecycle lifecycle) {
+            super(context, fragment, device, lifecycle);
+        }
+
+        @Override
+        public String getPreferenceKey() {
+            return null;
+        }
+
+        @Override
+        protected void init(PreferenceScreen screen) {}
+
+        @Override
+        protected void refresh() {}
+    }
+
+    @Test
+    public void pauseResumeEvents() {
+
+        TestController controller = spy(new TestController(mContext, mFragment, mCachedDevice,
+                mLifecycle));
+        verify(mLifecycle).addObserver(any(BluetoothDetailsController.class));
+
+        showScreen(controller);
+        verify(mCachedDevice, times(1)).registerCallback(controller);
+        verify(controller, times(1)).refresh();
+
+        controller.onPause();
+        verify(controller, times(1)).refresh();
+        verify(mCachedDevice).unregisterCallback(controller);
+
+        controller.onResume();
+        verify(controller, times(2)).refresh();
+        verify(mCachedDevice, times(2)).registerCallback(controller);
+
+        // The init function should only have been called once
+        verify(controller, times(1)).init(mScreen);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
new file mode 100644
index 0000000..3b8db04
--- /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 0000000..27c1a83
--- /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 0000000..24b28a1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+import com.android.settingslib.widget.FooterPreference;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows=SettingsShadowBluetoothDevice.class)
+public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase {
+    private BluetoothDetailsMacAddressController mController;
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        mController = new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice,
+                mLifecycle);
+        setupDevice(mDeviceConfig);
+    }
+
+    @Test
+    public void macAddress() {
+        showScreen(mController);
+        FooterPreference footer = (FooterPreference) mScreen.findPreference(
+                mController.getPreferenceKey());
+        assertThat(footer.getTitle().toString()).endsWith(mDeviceConfig.getAddress());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
new file mode 100644
index 0000000..445e4e3
--- /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 0000000..544b590
--- /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 0000000..0aeff2d
--- /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 c4c1f8a..d60571c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -15,13 +15,14 @@
  */
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.UserManager;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -136,4 +137,13 @@
 
         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 0000000..cde95cd
--- /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 074bef2..2d64396 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.widget.MasterSwitchController;
@@ -41,7 +41,6 @@
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
new file mode 100644
index 0000000..7713aaf
--- /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 177130e..9634661 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
@@ -16,14 +16,16 @@
 
 package com.android.settings.bluetooth;
 
+import android.app.Fragment;
 import android.content.Context;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -38,7 +40,10 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -54,17 +59,26 @@
     private MasterSwitchPreference mPreference;
     @Mock
     private RestrictionUtils mRestrictionUtils;
+    @Mock
+    private Fragment mFragment;
+    @Mock
+    private SettingsActivity mActivity;
 
     private Context mContext;
     private BluetoothMasterSwitchPreferenceController mController;
+    private FakeFeatureFactory mFeatureFactory;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application.getApplicationContext();
+        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+
         mController = new BluetoothMasterSwitchPreferenceController(
-                mContext, mBluetoothManager, mRestrictionUtils);
+                mContext, mBluetoothManager, mRestrictionUtils, mFragment, mActivity);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
     }
 
     @Test
@@ -84,7 +98,7 @@
         mController.onPause();
 
         verify(mBluetoothManager.getEventManager()).unregisterCallback(
-            any(BluetoothCallback.class));
+                any(BluetoothCallback.class));
     }
 
     @Test
@@ -113,5 +127,4 @@
 
         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 0000000..d1d4935
--- /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 73f6b84..7a6ae79 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.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.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 @@
         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 @@
         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 @@
         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 0000000..4459f61
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BluetoothPairingPreferenceControllerTest {
+    private static final int ORDER = 1;
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceFragment mFragment;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    @Mock
+    private FragmentManager mFragmentManager;
+    @Mock
+    private FragmentTransaction mFragmentTransaction;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private SettingsActivity mSettingsActivity;
+    private Preference mPreference;
+
+    private BluetoothPairingPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        when(mFragment.getPreferenceScreen().getContext()).thenReturn(mContext);
+
+        mPreference = new Preference(mContext);
+        mPreference.setKey(BluetoothPairingPreferenceController.KEY_PAIRING);
+
+        mController = new BluetoothPairingPreferenceController(mContext, mFragment,
+                mSettingsActivity);
+    }
+
+    @Test
+    public void testCreateBluetoothPairingPreference() {
+        Preference pref = mController.createBluetoothPairingPreference(ORDER);
+
+        assertThat(pref.getKey()).isEqualTo(BluetoothPairingPreferenceController.KEY_PAIRING);
+        assertThat(pref.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_add));
+        assertThat(pref.getOrder()).isEqualTo(ORDER);
+        assertThat(pref.getTitle()).isEqualTo(
+                mContext.getString(R.string.bluetooth_pairing_pref_title));
+    }
+
+    @Test
+    public void testHandlePreferenceTreeClick_startFragment() {
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mSettingsActivity).startPreferencePanelAsUser(eq(mFragment), anyString(), any(),
+                anyInt(), any(), any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
index 8272dbf..0061ee5 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -32,11 +32,7 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
index 9e90fdf..c772560 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
@@ -16,22 +16,148 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
+import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroup;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.widget.FooterPreference;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.List;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class BluetoothSettingsTest {
+    private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Resources mResource;
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    @Mock
+    private Activity mActivity;
+    @Mock
+    private PreferenceGroup mPairedDevicesCategory;
+    @Mock
+    private BluetoothPairingPreferenceController mPairingPreferenceController;
+    private Context mContext;
+    private BluetoothSettings mFragment;
+    private FakeFeatureFactory mFeatureFactory;
+    private Preference mFooterPreference;
+    private TextView mEmptyMessage;
+    private View mContainer;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+
+        mFragment = spy(new BluetoothSettings());
+
+        doReturn(mContext).when(mFragment).getContext();
+        doReturn(mResource).when(mFragment).getResources();
+        doReturn(mActivity).when(mFragment).getActivity();
+
+        mContainer = new View(mContext);
+        mEmptyMessage = new TextView(mContext);
+        doReturn(mContainer).when(mActivity).findViewById(android.R.id.list_container);
+        doReturn(mEmptyMessage).when(mActivity).findViewById(android.R.id.empty);
+
+        mFooterPreference = new FooterPreference(RuntimeEnvironment.application);
+        mFragment.setLocalBluetoothAdapter(mLocalAdapter);
+        mFragment.mPairingPrefController = mPairingPreferenceController;
+    }
 
     @Test
     public void setTextSpan_notSpannable_shouldNotCrash() {
         final String str = "test";
-        final BluetoothSettings settings = new BluetoothSettings();
-        settings.setTextSpan(str, "hello");
+        mFragment.setTextSpan(str, "hello");
+    }
+
+    @Test
+    public void setUpdateMyDevicePreference_setTitleCorrectly() {
+        doReturn(FOOTAGE_MAC_STRING).when(mFragment).getString(
+                eq(R.string.bluetooth_footer_mac_message), any());
+
+        mFragment.updateFooterPreference(mFooterPreference);
+
+        assertThat(mFooterPreference.getTitle()).isEqualTo(FOOTAGE_MAC_STRING);
+    }
+
+    @Test
+    public void testDisplayEmptyMessage_showEmptyMessage() {
+        mFragment.displayEmptyMessage(true);
+
+        assertThat(mContainer.getVisibility()).isEqualTo(View.INVISIBLE);
+        assertThat(mEmptyMessage.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void testDisplayEmptyMessage_hideEmptyMessage() {
+        mFragment.displayEmptyMessage(false);
+
+        assertThat(mContainer.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(mEmptyMessage.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testInitPreferencesFromPreferenceScreen() {
+        doReturn(mPairedDevicesCategory).when(mFragment).findPreference(
+                BluetoothSettings.KEY_PAIRED_DEVICES);
+        doReturn(mFooterPreference).when(mFragment).findPreference(
+                BluetoothSettings.KEY_FOOTER_PREF);
+
+        mFragment.initPreferencesFromPreferenceScreen();
+
+        assertThat(mFragment.mPairedDevicesCategory).isEqualTo(mPairedDevicesCategory);
+        assertThat(mFragment.mFooterPreference).isEqualTo(mFooterPreference);
+    }
+
+    @Test
+    public void testSearchIndexProvider_pairPageEnabled_keyNotAdded() {
+        doReturn(true).when(mFeatureFactory.bluetoothFeatureProvider).isPairingPageEnabled();
+
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).doesNotContain(BluetoothSettings.DATA_KEY_REFERENCE);
+    }
+
+    @Test
+    public void testSearchIndexProvider_pairPageDisabled_keyAdded() {
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
+
+        assertThat(keys).contains(BluetoothSettings.DATA_KEY_REFERENCE);
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
index 79daa0e..e3f00d8 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
@@ -23,7 +23,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -44,9 +44,11 @@
 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;
 
@@ -134,6 +136,36 @@
     }
 
     @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<>();
         devices.add(mock(CachedBluetoothDevice.class));
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
new file mode 100644
index 0000000..c205c50
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DeviceListPreferenceFragmentTest {
+    private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Resources mResource;
+    @Mock
+    private Context mContext;
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    private TestFragment mFragment;
+    private Preference mMyDevicePreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mFragment = spy(new TestFragment());
+        doReturn(mContext).when(mFragment).getContext();
+        doReturn(mResource).when(mFragment).getResources();
+        mFragment.mLocalAdapter = mLocalAdapter;
+
+        mMyDevicePreference = new Preference(RuntimeEnvironment.application);
+    }
+
+    @Test
+    public void setUpdateMyDevicePreference_setTitleCorrectly() {
+        doReturn(FOOTAGE_MAC_STRING).when(mFragment).getString(
+                eq(R.string.bluetooth_footer_mac_message), any());
+
+        mFragment.updateFooterPreference(mMyDevicePreference);
+
+        assertThat(mMyDevicePreference.getTitle()).isEqualTo(FOOTAGE_MAC_STRING);
+    }
+
+    @Test
+    public void testEnableDisableScanning_testStateAfterEanbleDisable() {
+        mFragment.enableScanning();
+        verify(mLocalAdapter).startScanning(true);
+        assertThat(mFragment.mScanEnabled).isTrue();
+
+        mFragment.disableScanning();
+        verify(mLocalAdapter).stopScanning();
+        assertThat(mFragment.mScanEnabled).isFalse();
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanStarted() {
+        mFragment.enableScanning();
+        assertThat(mFragment.mScanEnabled).isTrue();
+        verify(mLocalAdapter).startScanning(true);
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanFinished() {
+        // Could happen when last scanning not done while current scan gets enabled
+        mFragment.enableScanning();
+        verify(mLocalAdapter).startScanning(true);
+        assertThat(mFragment.mScanEnabled).isTrue();
+
+        mFragment.onScanningStateChanged(false);
+        verify(mLocalAdapter, times(2)).startScanning(true);
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanStateMultiple() {
+        // Could happen when last scanning not done while current scan gets enabled
+        mFragment.enableScanning();
+        assertThat(mFragment.mScanEnabled).isTrue();
+        verify(mLocalAdapter).startScanning(true);
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
+
+        mFragment.onScanningStateChanged(false);
+        verify(mLocalAdapter, times(2)).startScanning(true);
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
+
+        mFragment.disableScanning();
+        verify(mLocalAdapter).stopScanning();
+
+        mFragment.onScanningStateChanged(false);
+        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(2)).startScanning(anyBoolean());
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanFinishedAfterDisable() {
+        mFragment.enableScanning();
+        verify(mLocalAdapter).startScanning(true);
+        assertThat(mFragment.mScanEnabled).isTrue();
+
+        mFragment.disableScanning();
+        verify(mLocalAdapter).stopScanning();
+        assertThat(mFragment.mScanEnabled).isFalse();
+
+        mFragment.onScanningStateChanged(false);
+        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
+    }
+
+    @Test
+    public void testScanningStateChanged_testScanStartedAfterDisable() {
+        mFragment.enableScanning();
+        verify(mLocalAdapter).startScanning(true);
+        assertThat(mFragment.mScanEnabled).isTrue();
+
+        mFragment.disableScanning();
+        verify(mLocalAdapter).stopScanning();
+        assertThat(mFragment.mScanEnabled).isFalse();
+
+        mFragment.onScanningStateChanged(true);
+        verify(mLocalAdapter, times(1)).startScanning(anyBoolean());
+    }
+
+    /**
+     * Fragment to test since {@code DeviceListPreferenceFragment} is abstract
+     */
+    public static class TestFragment extends DeviceListPreferenceFragment {
+
+        public TestFragment() {
+            super("");
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return 0;
+        }
+
+        @Override
+        public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {}
+
+        @Override
+        void initPreferencesFromPreferenceScreen() {}
+
+        @Override
+        public String getDeviceListKey() {
+            return null;
+        }
+
+        @Override
+        protected String getLogTag() {
+            return null;
+        }
+
+        @Override
+        protected int getPreferenceScreenResId() {
+            return 0;
+        }
+
+        @Override
+        protected List<PreferenceController> getPreferenceControllers(Context context) {
+            return null;
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
new file mode 100644
index 0000000..3294ffd
--- /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/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
index c61823c..a6793bb 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
@@ -23,7 +23,7 @@
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settingslib.R;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
new file mode 100644
index 0000000..21bc868
--- /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 0000000..a8ef4e6
--- /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/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
index 5f4b101..4667dac 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
@@ -18,7 +18,7 @@
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java b/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java
deleted file mode 100644
index dde291d..0000000
--- 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.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 e792845..dbeecaa 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -17,12 +17,15 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcManager;
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
+import com.android.settings.R;
 import com.android.settings.nfc.NfcPreferenceController;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settingslib.drawer.CategoryKey;
 
@@ -36,12 +39,17 @@
 
 import java.util.List;
 
+import static android.content.Context.NFC_SERVICE;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ConnectedDeviceDashboardFragmentTest {
+
     @Mock
     Context mContext;
 
@@ -65,7 +73,8 @@
     @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
-                mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext, true /* enabled */);
+                mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext,
+                        true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
@@ -74,7 +83,8 @@
     @Test
     public void testSearchIndexProvider_NoNfc_KeyAdded() {
         when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
 
         assertThat(keys).isNotNull();
         assertThat(keys).contains(NfcPreferenceController.KEY_TOGGLE_NFC);
@@ -84,7 +94,8 @@
     @Test
     public void testSearchIndexProvider_NFC_KeyNotAdded() {
         when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+                mContext);
 
         assertThat(keys).isNotNull();
         assertThat(keys).doesNotContain(NfcPreferenceController.KEY_TOGGLE_NFC);
@@ -103,4 +114,43 @@
 
         assertThat(keys).containsAllIn(niks);
     }
+
+    @Test
+    public void testSummaryProvider_hasNfc_shouldReturnNfcSummary() {
+        final NfcManager nfcManager = mock(NfcManager.class);
+        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
+
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getSystemService(NFC_SERVICE)).thenReturn(nfcManager);
+        when(nfcManager.getDefaultAdapter()).thenReturn(mock(NfcAdapter.class));
+
+        SummaryLoader.SummaryProvider provider =
+                new ConnectedDeviceDashboardFragment.SummaryProvider(mContext, summaryLoader);
+
+        provider.setListening(false);
+
+        verifyZeroInteractions(summaryLoader);
+
+        provider.setListening(true);
+
+        verify(mContext).getString(R.string.connected_devices_dashboard_summary);
+    }
+
+    @Test
+    public void testSummaryProvider_noNfc_shouldReturnNoNfcSummary() {
+        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
+
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+
+        SummaryLoader.SummaryProvider provider =
+                new ConnectedDeviceDashboardFragment.SummaryProvider(mContext, summaryLoader);
+
+        provider.setListening(false);
+
+        verifyZeroInteractions(summaryLoader);
+
+        provider.setListening(true);
+
+        verify(mContext).getString(R.string.connected_devices_dashboard_no_nfc_summary);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
index 4b84b0f..7edde6e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
@@ -7,7 +7,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.deviceinfo.UsbBackend;
 import com.android.settings.deviceinfo.UsbModeChooserActivity;
@@ -23,8 +23,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
diff --git a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
index 399c753..9bf73ce 100644
--- a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
@@ -20,10 +20,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.PreferenceAvailabilityObserver;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
index 4aa576f..23e1e2e 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.core.codeinspection;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector;
 import com.android.settings.search.SearchIndexProviderCodeInspector;
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
index 2f786f8..91046fe 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.core.codeinspection;
 
-import com.google.common.truth.Truth;
-
-import org.junit.Assert;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.io.BufferedReader;
@@ -27,6 +24,8 @@
 import java.lang.reflect.Modifier;
 import java.util.List;
 
+import static com.google.common.truth.Truth.assertWithMessage;
+
 /**
  * Inspector takes a list of class objects and perform static code analysis in its {@link #run()}
  * method.
@@ -49,6 +48,17 @@
      */
     public abstract void run();
 
+    protected void assertNoObsoleteInGrandfatherList(String listName, List<String> list) {
+        final StringBuilder obsoleteGrandfatherItems = new StringBuilder(
+                listName + " contains item that should not be grandfathered.\n");
+        for (String c : list) {
+            obsoleteGrandfatherItems.append(c).append("\n");
+        }
+        assertWithMessage(obsoleteGrandfatherItems.toString())
+                .that(list)
+                .isEmpty();
+    }
+
     protected boolean isConcreteSettingsClass(Class clazz) {
         // Abstract classes
         if (Modifier.isAbstract(clazz.getModifiers())) {
@@ -56,7 +66,7 @@
         }
         final String packageName = clazz.getPackage().getName();
         // Classes that are not in Settings
-        if (!packageName.contains(PACKAGE_NAME + ".")) {
+        if (!packageName.contains(PACKAGE_NAME + ".") && !packageName.endsWith(PACKAGE_NAME)) {
             return false;
         }
         final String className = clazz.getName();
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
index ed4e50c..4455549 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
@@ -51,9 +51,11 @@
             }
             final String className = clazz.getName();
             // If it's a fragment, it must also be instrumentable.
+            final boolean whitelisted =
+                    grandfather_notImplementingInstrumentable.remove(className);
             if (Fragment.class.isAssignableFrom(clazz)
                     && !Instrumentable.class.isAssignableFrom(clazz)
-                    && !grandfather_notImplementingInstrumentable.contains(className)) {
+                    && !whitelisted) {
                 broken.add(className);
             }
         }
@@ -65,5 +67,7 @@
         assertWithMessage(sb.toString())
                 .that(broken.isEmpty())
                 .isTrue();
+        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_instrumentable",
+                grandfather_notImplementingInstrumentable);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
index 0abac1d..a927306 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
@@ -16,7 +16,7 @@
 package com.android.settings.core.instrumentation;
 
 import android.os.Bundle;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index eb6e392..ea33c83 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -21,7 +21,7 @@
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.overlay.FeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
index 763d6e3..ec644a6 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
@@ -19,20 +19,33 @@
 import android.content.SharedPreferences;
 import android.util.Pair;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
+import com.google.common.truth.Platform;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
+import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .ACTION_SETTINGS_PREFERENCE_CHANGE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .FIELD_SETTINGS_PREFERENCE_CHANGE_NAME;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -46,6 +59,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
 
+    private ArgumentMatcher<Pair<Integer, Object>> mNamePairMatcher;
     private FakeFeatureFactory mFactory;
     private MetricsFeatureProvider mMetricsFeature;
     private SharedPreferencesLogger mSharedPrefLogger;
@@ -58,6 +72,7 @@
         mMetricsFeature = mFactory.metricsFeatureProvider;
 
         mSharedPrefLogger = new SharedPreferencesLogger(mContext, TEST_TAG);
+        mNamePairMatcher = pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, String.class);
     }
 
     @Test
@@ -72,7 +87,8 @@
         editor.putInt(TEST_KEY, 2);
 
         verify(mMetricsFeature, times(6)).action(any(Context.class), anyInt(),
-                any(Pair.class), any(Pair.class));
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, Long.class)));
     }
 
     @Test
@@ -84,8 +100,13 @@
         editor.putBoolean(TEST_KEY, false);
         editor.putBoolean(TEST_KEY, false);
 
-        verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
-                any(Pair.class), any(Pair.class));
+
+        verify(mMetricsFeature).action(any(Context.class), anyInt(),
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, true)));
+        verify(mMetricsFeature, times(3)).action(any(Context.class), anyInt(),
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, false)));
     }
 
     @Test
@@ -98,7 +119,8 @@
         editor.putLong(TEST_KEY, 2);
 
         verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
-                any(Pair.class), any(Pair.class));
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_LONG_VALUE, Long.class)));
     }
 
     @Test
@@ -111,7 +133,26 @@
         editor.putFloat(TEST_KEY, 2);
 
         verify(mMetricsFeature, times(4)).action(any(Context.class), anyInt(),
-                any(Pair.class), any(Pair.class));
+                argThat(mNamePairMatcher),
+                argThat(pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE, Float.class)));
     }
 
+    @Test
+    public void logPackage_shouldUseLogPackageApi() {
+        mSharedPrefLogger.logPackageName("key", "com.android.settings");
+        verify(mMetricsFeature).action(any(Context.class),
+                eq(ACTION_SETTINGS_PREFERENCE_CHANGE),
+                eq("com.android.settings"),
+                any(Pair.class));
+    }
+
+    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, Class clazz) {
+        return pair -> pair.first == tag && Platform.isInstanceOfType(pair.second, clazz);
+    }
+
+    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag, boolean bool) {
+        return pair -> pair.first == tag
+                && Platform.isInstanceOfType(pair.second, Long.class)
+                && pair.second.equals((bool ? 1L : 0L));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
index 8a555a8..1a47a66 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
@@ -15,13 +15,24 @@
  */
 package com.android.settings.core.instrumentation;
 
+import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -31,16 +42,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.android.settings.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -62,7 +63,7 @@
         mMixin.onResume();
 
         verify(mMetricsFeature, times(1))
-                .visible(any(Context.class), eq(MetricsProto.MetricsEvent.VIEW_UNKNOWN),
+                .visible(nullable(Context.class), eq(MetricsProto.MetricsEvent.VIEW_UNKNOWN),
                         eq(TestInstrumentable.TEST_METRIC));
     }
 
@@ -77,7 +78,7 @@
         mMixin.onResume();
 
         verify(mMetricsFeature, times(1))
-                .visible(any(Context.class), eq(MetricsProto.MetricsEvent.SETTINGS_GESTURES),
+                .visible(nullable(Context.class), eq(MetricsProto.MetricsEvent.SETTINGS_GESTURES),
                         eq(TestInstrumentable.TEST_METRIC));
     }
 
@@ -86,7 +87,7 @@
         mMixin.onPause();
 
         verify(mMetricsFeature, times(1))
-                .hidden(any(Context.class), eq(TestInstrumentable.TEST_METRIC));
+                .hidden(nullable(Context.class), eq(TestInstrumentable.TEST_METRIC));
     }
 
     @Test
@@ -96,7 +97,7 @@
         mMixin.onPause();
 
         verify(mMetricsFeature, never())
-                .hidden(any(Context.class), anyInt());
+                .hidden(nullable(Context.class), anyInt());
     }
 
     @Test
@@ -107,7 +108,7 @@
         mMixin.onPause();
 
         verify(mMetricsFeature, never())
-                .hidden(any(Context.class), anyInt());
+                .hidden(nullable(Context.class), anyInt());
     }
 
     private final class TestInstrumentable implements Instrumentable {
diff --git a/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java b/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java
deleted file mode 100644
index d863143..0000000
--- a/tests/robotests/src/com/android/settings/core/lifecycle/LifecycleTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.core.lifecycle;
-
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.events.OnAttach;
-import com.android.settings.core.lifecycle.events.OnCreateOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnDestroy;
-import com.android.settings.core.lifecycle.events.OnOptionsItemSelected;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnPrepareOptionsMenu;
-import com.android.settings.core.lifecycle.events.OnResume;
-import com.android.settings.core.lifecycle.events.OnStart;
-import com.android.settings.core.lifecycle.events.OnStop;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
-import org.robolectric.util.FragmentController;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class LifecycleTest {
-
-    public static class TestDialogFragment extends ObservableDialogFragment {
-
-        final TestObserver mFragObserver;
-
-        public TestDialogFragment() {
-            mFragObserver = new TestObserver();
-            mLifecycle.addObserver(mFragObserver);
-        }
-    }
-
-    public static class TestFragment extends ObservableFragment {
-
-        final TestObserver mFragObserver;
-
-        public TestFragment() {
-            mFragObserver = new TestObserver();
-            getLifecycle().addObserver(mFragObserver);
-        }
-    }
-
-    public static class TestActivity extends ObservableActivity {
-
-        final TestObserver mActObserver;
-
-        public TestActivity() {
-            mActObserver = new TestObserver();
-            getLifecycle().addObserver(mActObserver);
-        }
-
-    }
-
-    public static class TestObserver implements LifecycleObserver, OnAttach, OnStart, OnResume,
-            OnPause, OnStop, OnDestroy, OnCreateOptionsMenu, OnPrepareOptionsMenu,
-            OnOptionsItemSelected {
-
-        boolean mOnAttachObserved;
-        boolean mOnAttachHasContext;
-        boolean mOnStartObserved;
-        boolean mOnResumeObserved;
-        boolean mOnPauseObserved;
-        boolean mOnStopObserved;
-        boolean mOnDestroyObserved;
-        boolean mOnCreateOptionsMenuObserved;
-        boolean mOnPrepareOptionsMenuObserved;
-        boolean mOnOptionsItemSelectedObserved;
-
-        @Override
-        public void onAttach(Context context) {
-            mOnAttachObserved = true;
-            mOnAttachHasContext = context != null;
-        }
-
-        @Override
-        public void onStart() {
-            mOnStartObserved = true;
-        }
-
-        @Override
-        public void onPause() {
-            mOnPauseObserved = true;
-        }
-
-        @Override
-        public void onResume() {
-            mOnResumeObserved = true;
-        }
-
-        @Override
-        public void onStop() {
-            mOnStopObserved = true;
-        }
-
-        @Override
-        public void onDestroy() {
-            mOnDestroyObserved = true;
-        }
-
-        @Override
-        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-            mOnCreateOptionsMenuObserved = true;
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem menuItem) {
-            mOnOptionsItemSelectedObserved = true;
-            return true;
-        }
-
-        @Override
-        public void onPrepareOptionsMenu(Menu menu) {
-            mOnPrepareOptionsMenuObserved = true;
-        }
-    }
-
-    @Test
-    public void runThroughActivityLifecycles_shouldObserveEverything() {
-        ActivityController<TestActivity> ac = Robolectric.buildActivity(TestActivity.class);
-        TestActivity activity = ac.get();
-
-        ac.start();
-        assertThat(activity.mActObserver.mOnStartObserved).isTrue();
-        ac.resume();
-        assertThat(activity.mActObserver.mOnResumeObserved).isTrue();
-        activity.onCreateOptionsMenu(null);
-        assertThat(activity.mActObserver.mOnCreateOptionsMenuObserved).isTrue();
-        activity.onPrepareOptionsMenu(null);
-        assertThat(activity.mActObserver.mOnPrepareOptionsMenuObserved).isTrue();
-        activity.onOptionsItemSelected(null);
-        assertThat(activity.mActObserver.mOnOptionsItemSelectedObserved).isTrue();
-        ac.pause();
-        assertThat(activity.mActObserver.mOnPauseObserved).isTrue();
-        ac.stop();
-        assertThat(activity.mActObserver.mOnStopObserved).isTrue();
-        ac.destroy();
-        assertThat(activity.mActObserver.mOnDestroyObserved).isTrue();
-    }
-
-    @Test
-    public void runThroughDialogFragmentLifecycles_shouldObserveEverything() {
-        FragmentController<TestDialogFragment> fragmentController =
-                Robolectric.buildFragment(TestDialogFragment.class);
-        TestDialogFragment fragment = fragmentController.get();
-
-        fragmentController.attach().create().start().resume();
-        fragment.onCreateOptionsMenu(null, null);
-        fragment.onPrepareOptionsMenu(null);
-        fragment.onOptionsItemSelected(null);
-        fragmentController.pause().stop().destroy();
-
-        assertThat(fragment.mFragObserver.mOnAttachObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnAttachHasContext).isTrue();
-        assertThat(fragment.mFragObserver.mOnStartObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnResumeObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnPauseObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnStopObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnDestroyObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnCreateOptionsMenuObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnPrepareOptionsMenuObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnOptionsItemSelectedObserved).isTrue();
-    }
-
-    @Test
-    public void runThroughFragmentLifecycles_shouldObserveEverything() {
-        FragmentController<TestFragment> fragmentController =
-                Robolectric.buildFragment(TestFragment.class);
-        TestFragment fragment = fragmentController.get();
-
-        fragmentController.attach().create().start().resume();
-        fragment.onCreateOptionsMenu(null, null);
-        fragment.onPrepareOptionsMenu(null);
-        fragment.onOptionsItemSelected(null);
-        fragmentController.pause().stop().destroy();
-
-        assertThat(fragment.mFragObserver.mOnAttachObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnAttachHasContext).isTrue();
-        assertThat(fragment.mFragObserver.mOnStartObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnResumeObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnPauseObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnStopObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnDestroyObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnCreateOptionsMenuObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnPrepareOptionsMenuObserved).isTrue();
-        assertThat(fragment.mFragObserver.mOnOptionsItemSelectedObserved).isTrue();
-    }
-
-    private static class OptionItemAccepter implements LifecycleObserver, OnOptionsItemSelected {
-        public boolean wasCalled = false;
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem menuItem) {
-            wasCalled = true;
-            return false;
-        }
-    }
-
-    @Test
-    public void onOptionItemSelectedShortCircuitsIfAnObserverHandlesTheMenuItem() {
-        FragmentController<TestFragment> fragmentController =
-                Robolectric.buildFragment(TestFragment.class);
-        TestFragment fragment = fragmentController.get();
-        OptionItemAccepter accepter = new OptionItemAccepter();
-        fragment.getLifecycle().addObserver(accepter);
-
-        fragmentController.attach().create().start().resume();
-        fragment.onCreateOptionsMenu(null, null);
-        fragment.onPrepareOptionsMenu(null);
-        fragment.onOptionsItemSelected(null);
-        fragmentController.pause().stop().destroy();
-
-        assertThat(accepter.wasCalled).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index d7daa03..4d81320 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.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.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 @@
 public class DashboardAdapterTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
+    private SettingsActivity mContext;
     @Mock
     private View mView;
     @Mock
@@ -75,14 +95,16 @@
     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 @@
         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 @@
 
     @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 @@
 
     @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 @@
 
     @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 @@
 
     @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 @@
 
     @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 @@
 
     @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 @@
 
     @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 @@
 
     @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 @@
 
     @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 @@
         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 @@
         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 abea565..fdbbefb 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 @@
         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 @@
 
     @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 @@
     @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 @@
     @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 @@
         //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 @@
 
                 return arg2 - resultData.arg2;
             }
+
+            @Override
+            public String toString() {
+                return "op:" + operation + ",arg1:" + arg1 + ",arg2:" + arg2;
+            }
         }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index e7587d5..2791da3 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -20,6 +20,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
@@ -30,7 +31,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -364,4 +365,16 @@
     public void testGetExtraIntentAction_shouldReturnNull() {
         assertThat(mImpl.getExtraIntentAction()).isNull();
     }
+
+    @Test
+    public void testShouldTintIcon_shouldReturnValueFromResource() {
+        final Resources res = mActivity.getApplicationContext().getResources();
+        when(res.getBoolean(R.bool.config_tintSettingIcon))
+                .thenReturn(false);
+        assertThat(mImpl.shouldTintIcon()).isFalse();
+
+        when(res.getBoolean(R.bool.config_tintSettingIcon))
+                .thenReturn(true);
+        assertThat(mImpl.shouldTintIcon()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
index 6b22f7b..d102ab4 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
@@ -21,7 +21,7 @@
 
 import com.android.settings.core.PreferenceController;
 import com.android.settings.search.Indexable;
-import com.android.settings.search2.DatabaseIndexingUtils;
+import com.android.settings.search.DatabaseIndexingUtils;
 
 import org.robolectric.RuntimeEnvironment;
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index e35fa33..2d32949 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -15,13 +15,22 @@
  */
 package com.android.settings.dashboard;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
@@ -43,15 +52,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DashboardFragmentTest {
@@ -75,9 +75,10 @@
         mDashboardCategory.tiles.add(new Tile());
         mTestFragment = new TestFragment(ShadowApplication.getInstance().getApplicationContext());
         when(mFakeFeatureFactory.dashboardFeatureProvider.getProgressiveDisclosureMixin(
-                any(Context.class), eq(mTestFragment), any(Bundle.class)))
+                nullable(Context.class), eq(mTestFragment), nullable(Bundle.class)))
                 .thenReturn(mDisclosureMixin);
-        when(mFakeFeatureFactory.dashboardFeatureProvider.getTilesForCategory(anyString()))
+        when(mFakeFeatureFactory.dashboardFeatureProvider
+                .getTilesForCategory(nullable(String.class)))
                 .thenReturn(mDashboardCategory);
         mTestFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
         when(mContext.getPackageName()).thenReturn("TestPackage");
@@ -96,21 +97,23 @@
 
     @Test
     public void displayTilesAsPreference_shouldAddTilesWithIntent() {
-        when(mFakeFeatureFactory.dashboardFeatureProvider.getTilesForCategory(anyString()))
+        when(mFakeFeatureFactory.dashboardFeatureProvider
+                .getTilesForCategory(nullable(String.class)))
                 .thenReturn(mDashboardCategory);
-        when(mFakeFeatureFactory.dashboardFeatureProvider.getDashboardKeyForTile(any(Tile.class)))
+        when(mFakeFeatureFactory.dashboardFeatureProvider
+                .getDashboardKeyForTile(nullable(Tile.class)))
                 .thenReturn("test_key");
         mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
 
-        verify(mDisclosureMixin).addPreference(any(PreferenceScreen.class),
-                any(Preference.class));
+        verify(mDisclosureMixin).addPreference(nullable(PreferenceScreen.class),
+                nullable(Preference.class));
     }
 
     @Test
     public void displayTilesAsPreference_shouldNotAddTilesWithoutIntent() {
         mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
 
-        verify(mTestFragment.mScreen, never()).addPreference(any(Preference.class));
+        verify(mTestFragment.mScreen, never()).addPreference(nullable(Preference.class));
     }
 
     @Test
@@ -118,7 +121,7 @@
         mDashboardCategory.tiles = null;
         mTestFragment.onCreatePreferences(new Bundle(), "rootKey");
 
-        verify(mTestFragment.mScreen, never()).addPreference(any(Preference.class));
+        verify(mTestFragment.mScreen, never()).addPreference(nullable(Preference.class));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
index 90ff25c..cda9a22 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.widget.TextView;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SupportItemAdapter.ViewHolder;
 import com.android.settingslib.drawer.Tile;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
index a8e294c..32657b8 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
@@ -19,11 +19,12 @@
 import android.app.Activity;
 import android.support.v7.widget.LinearLayoutManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.dashboard.conditional.FocusRecyclerView;
 import com.android.settingslib.drawer.CategoryKey;
+import com.android.settingslib.drawer.Tile;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -33,7 +34,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static org.mockito.Matchers.anyList;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -109,4 +109,10 @@
         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/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
index a7b0c54..c48f30c 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
index a3b9bf8..6fe60cf 100644
--- a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -40,9 +40,10 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -118,7 +119,7 @@
 
     @Test
     public void findPreference_prefInCollapsedList_shouldFindIt() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         mMixin.addToCollapsedList(mPreference);
 
         Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
@@ -139,7 +140,7 @@
 
     @Test
     public void findPreference_prefNotInCollapsedListOrScreen_shouldNotFindIt() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         Preference pref = mMixin.findPreference(mScreen, mPreference.getKey());
 
         assertThat(pref).isNull();
@@ -147,7 +148,7 @@
 
     @Test
     public void findPreference_prefRemovedFromCollapsedList_shouldNotFindIt() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         mMixin.addToCollapsedList(mPreference);
         mMixin.removePreference(mPreferenceFragment.getPreferenceScreen(), mPreference.getKey());
 
@@ -158,7 +159,7 @@
 
     @Test
     public void findPreference_nestedPrefInCollapsedList_shouldFindIt() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         final PreferenceScreen prefGroup = spy(new PreferenceScreen(mAppContext, null));
         when(prefGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
         final Preference preference = mock(Preference.class);
@@ -183,7 +184,7 @@
 
     @Test
     public void removeLastPreference_shouldRemoveExpandButtonToo() {
-        when(mScreen.findPreference(anyString())).thenReturn(null);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(null);
         mMixin.addToCollapsedList(mPreference);
         // Collapsed
         assertThat(mMixin.isCollapsed()).isTrue();
@@ -204,7 +205,7 @@
 
         mMixin.collapse(screen);
         assertThat(mMixin.isCollapsed()).isFalse();
-        verify(mExpandButton, never()).setSummary(anyString());
+        verify(mExpandButton, never()).setSummary(nullable(String.class));
         verify(screen, never()).addPreference(any(Preference.class));
         verify(screen, never()).removePreference(any(Preference.class));
     }
@@ -219,7 +220,7 @@
         mMixin.collapse(screen);
 
         assertThat(mMixin.isCollapsed()).isTrue();
-        verify(mExpandButton, atLeastOnce()).setSummary(anyString());
+        verify(mExpandButton, atLeastOnce()).setSummary(nullable(String.class));
         verify(screen).addPreference(any(ExpandPreference.class));
         verify(screen, times(3)).removePreference(any(Preference.class));
     }
@@ -264,7 +265,7 @@
         lastPref.setOrder(100);
         // Add something to collapsed list so we are in collapsed state.
         mMixin.addToCollapsedList(new Preference(mAppContext));
-        verify(mExpandButton).setSummary(anyString());
+        verify(mExpandButton).setSummary(nullable(String.class));
         assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(1);
 
         // 3 prefs on screen, 2 are real and the last one is more button.
@@ -286,7 +287,7 @@
         lastPref.setOrder(100);
         // Add something to collapsed list so we are in collapsed state.
         mMixin.addToCollapsedList(new Preference(mAppContext));
-        verify(mExpandButton).setSummary(anyString());
+        verify(mExpandButton).setSummary(nullable(String.class));
         assertThat(mMixin.getCollapsedPrefs().size()).isEqualTo(1);
 
         // 3 prefs on screen, 2 are real and the last one is more button.
@@ -299,7 +300,7 @@
 
         verify(mScreen, never()).removePreference(any(Preference.class));
         verify(mScreen, never()).addPreference(any(Preference.class));
-        verify(mExpandButton, times(2)).setSummary(anyString());
+        verify(mExpandButton, times(2)).setSummary(nullable(String.class));
         assertThat(mMixin.getCollapsedPrefs().get(0)).isSameAs(toBeAdded);
     }
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
index 547792b..b08d62e 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.dashboard;
 
 import android.app.Activity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
diff --git a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
index b0dfe61..3dd5266 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SupportItemAdapterTest.java
@@ -26,7 +26,7 @@
 import android.widget.SpinnerAdapter;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.SupportItemAdapter.EscalationData;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
new file mode 100644
index 0000000..d943fe3
--- /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/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
index 4ef7263..d077e6f 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
@@ -20,7 +20,7 @@
 import android.content.IntentFilter;
 import android.graphics.drawable.Icon;
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
index 3344698..e46ae9e 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
@@ -18,7 +18,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
index 4b9e440..114ee2b 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.dashboard.suggestions;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
new file mode 100644
index 0000000..bd3650b
--- /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 4a41ede..ca9faf5 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
@@ -16,16 +16,25 @@
 
 package com.android.settings.dashboard.suggestions;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.suggestions.SuggestionParser;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,14 +44,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SuggestionDismissControllerTest {
@@ -86,9 +87,18 @@
     }
 
     @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 @@
         mController.onSwiped(vh, ItemTouchHelper.START);
 
         verify(mFactory.suggestionsFeatureProvider).dismissSuggestion(
-                eq(mContext), eq(mSuggestionParser), any(Tile.class));
-        verify(mCallback).onSuggestionDismissed(any(Tile.class));
+                eq(mContext), eq(mSuggestionParser), nullable(Tile.class));
+        verify(mCallback).onSuggestionDismissed(nullable(Tile.class));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index 3efe15a..df25a50 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.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.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,7 +91,12 @@
         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";
 
@@ -73,6 +104,166 @@
     }
 
     @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);
         mProvider.dismissSuggestion(mContext, mSuggestionParser, null);
@@ -108,6 +299,15 @@
     }
 
     @Test
+    public void getSuggestionIdentifier_nullContext_shouldNotCrash() {
+        final Tile suggestion = new Tile();
+        suggestion.intent = new Intent()
+                .setClassName(RuntimeEnvironment.application.getPackageName(), "123");
+        assertThat(mProvider.getSuggestionIdentifier(null, suggestion))
+                .isNotEmpty();
+    }
+
+    @Test
     public void dismissSuggestion_hasMoreDismissCount_shouldNotDisableComponent() {
         when(mSuggestionParser.dismissSuggestion(any(Tile.class), anyBoolean()))
                 .thenReturn(false);
@@ -120,7 +320,6 @@
         verify(mContext, never()).getPackageManager();
     }
 
-
     @Test
     public void dismissSuggestion_noContext_shouldDoNothing() {
         mProvider.dismissSuggestion(null, mSuggestionParser, mSuggestion);
@@ -144,6 +343,26 @@
                 .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/SuggestionFeaturizerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
index cb4ce71..4d6a743 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java
@@ -19,7 +19,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
index 056d959..1f32531 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.Tile;
 
@@ -35,8 +35,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import org.robolectric.RuntimeEnvironment;
-
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.same;
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
index accca2a..028df05 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.hardware.fingerprint.FingerprintManager;
 
 import com.android.settings.Settings;
-import com.android.settings.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 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 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 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 0000000..05efa9f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.ArraySet;
+import android.view.View;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.PackageManagerWrapper;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settings.widget.EntityHeaderController.ActionType;
+import com.android.settingslib.AppItem;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = ShadowEntityHeaderController.class)
+public class AppDataUsageTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private EntityHeaderController mHeaderController;
+    @Mock
+    private PackageManagerWrapper mPackageManagerWrapper;
+
+    private AppDataUsage mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEntityHeaderController.reset();
+    }
+
+    @Test
+    public void bindAppHeader_allWorkApps_shouldNotShowAppInfoLink() {
+        ShadowEntityHeaderController.setUseMock(mHeaderController);
+        when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
+        when(mHeaderController.setUid(anyInt())).thenReturn(mHeaderController);
+
+        mFragment = spy(new AppDataUsage());
+
+        doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))
+                .when(mFragment)
+                .getPreferenceManager();
+        doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+        ReflectionHelpers.setField(mFragment, "mAppItem", mock(AppItem.class));
+
+        mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
+
+        verify(mHeaderController).setButtonActions(ActionType.ACTION_NONE, ActionType.ACTION_NONE);
+    }
+
+    @Test
+    public void bindAppHeader_workApp_shouldSetWorkAppUid() throws
+            PackageManager.NameNotFoundException {
+        final int fakeUserId = 100;
+
+        mFragment = spy(new AppDataUsage());
+        final ArraySet<String> packages = new ArraySet<>();
+        packages.add("pkg");
+        final AppItem appItem = new AppItem(123456789);
+
+        ReflectionHelpers.setField(mFragment, "mPackageManagerWrapper", mPackageManagerWrapper);
+        ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
+        ReflectionHelpers.setField(mFragment, "mPackages", packages);
+
+        when(mPackageManagerWrapper.getPackageUidAsUser(anyString(), anyInt()))
+                .thenReturn(fakeUserId);
+
+        ShadowEntityHeaderController.setUseMock(mHeaderController);
+        when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
+        when(mHeaderController.setUid(fakeUserId)).thenReturn(mHeaderController);
+
+        doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))
+                .when(mFragment)
+                .getPreferenceManager();
+        doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+
+        mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
+
+        verify(mHeaderController)
+                .setButtonActions(ActionType.ACTION_APP_INFO, ActionType.ACTION_NONE);
+        verify(mHeaderController)
+                .setUid(fakeUserId);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
index fd1c96b..ac28e1d 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
@@ -30,7 +30,7 @@
 import android.support.v7.preference.Preference;
 
 import android.util.ArraySet;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index eec4324..8b635d2 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -20,7 +20,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
index 003f4d3..e60243b 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
@@ -2,7 +2,7 @@
 
 import android.net.NetworkPolicy;
 import android.net.NetworkTemplate;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.net.DataUsageController.DataUsageInfo;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
index c5570bb..9ab88d3 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.NetworkPolicyEditor;
 
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 92ded0d..e4ad5b5 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -23,10 +23,11 @@
 import android.net.wifi.WifiManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.ShadowDataUsageSummary;
 import com.android.settingslib.NetworkPolicyEditor;
 
 import org.junit.Before;
@@ -149,27 +150,50 @@
     }
 
     @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 d674c77..f20e50c 100644
--- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
@@ -15,14 +15,22 @@
  */
 package com.android.settings.datausage;
 
-import com.android.internal.logging.nano.MetricsProto;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.os.Process;
-import com.android.settings.SettingsRobolectricTestRunner;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.applications.ApplicationsState;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,11 +39,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UnrestrictedDataAccessTest {
@@ -75,11 +78,11 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW), eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_UNL_DATA_DENY), eq("app"));
     }
 
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
index d0bd67b..d28cad1 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedSwitchPreference;
 
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
index 0ac0251..41bff93 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
@@ -21,7 +21,7 @@
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
index 4b9d3ec..e6a6dd8 100644
--- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
index 8a8c066..843c753 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
@@ -19,11 +19,11 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.LifecycleObserver;
-import com.android.settings.core.lifecycle.events.OnPause;
-import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
index 41c5a27..58ecd62 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import java.util.List;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
index 3995f37..15877e0 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
index cab6f71..2f96d65 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
index 4acac70..92807e9 100644
--- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
@@ -16,12 +16,17 @@
 
 package com.android.settings.datetime;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settings.testutils.shadow.ShadowZoneGetter;
@@ -33,11 +38,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ZonePickerTest {
@@ -64,8 +64,8 @@
 
         // Should render
         verify(mZonePicker).onCreateView(
-                any(LayoutInflater.class),
-                any(ViewGroup.class),
-                any(Bundle.class));
+                nullable(LayoutInflater.class),
+                nullable(ViewGroup.class),
+                nullable(Bundle.class));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
index be04eec..38c4ab2 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
@@ -33,7 +33,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
@@ -71,6 +71,7 @@
         mSwitchBar = new SwitchBar(mContext);
 
         Context fakeContextForFakeProvider = mock(Context.class, RETURNS_DEEP_STUBS);
+        FakeFeatureFactory.setupForTest(fakeContextForFakeProvider);
         FeatureFactory featureFactory = FakeFeatureFactory.getFactory(fakeContextForFakeProvider);
         mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
         mPreference = new Preference(mContext);
diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
index 902fb15..f703b26 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
@@ -25,7 +25,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -39,11 +39,9 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
index 35ca5f8..3b3b482 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
@@ -21,14 +21,12 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
@@ -38,7 +36,6 @@
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
similarity index 60%
copy from tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
copy to tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
index daa6d5e..5927646 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
@@ -14,27 +14,31 @@
  * limitations under the License.
  */
 
-package com.android.settings.search2;
+package com.android.settings.development;
 
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowToast;
 
 import static com.google.common.truth.Truth.assertThat;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryPayloadTest {
-
-    private SavedQueryPayload mPayload;
+public class DevelopmentSettingsDisabledActivityTest {
 
     @Test
-    public void getType_shouldBeSavedQueryType() {
-        mPayload = new SavedQueryPayload("Test");
-        assertThat(mPayload.getType()).isEqualTo(ResultPayload.PayloadType.SAVED_QUERY);
+    public void launchActivity_shouldShowToast() {
+        Robolectric.setupActivity(DevelopmentSettingsDisabledActivity.class);
+
+        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
+                RuntimeEnvironment.application.getString(R.string.dev_settings_disabled_warning));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
index 87905aa..c937841 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsEnablerTest.java
@@ -20,7 +20,7 @@
 import android.content.SharedPreferences;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
index 485a539..8e4b74d 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
@@ -18,13 +18,16 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.provider.SearchIndexableResource;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
@@ -33,12 +36,14 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
@@ -48,7 +53,11 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class
+        })
 public class DevelopmentSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -90,4 +99,38 @@
 
         verify(mScreen, times(2)).addPreference(any(Preference.class));
     }
+
+    @Test
+    public void searchIndex_shouldIndexFromPrefXml() {
+        final List<SearchIndexableResource> index =
+                DevelopmentSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        RuntimeEnvironment.application, true);
+
+        assertThat(index.size()).isEqualTo(1);
+        assertThat(index.get(0).xmlResId).isEqualTo(R.xml.development_prefs);
+    }
+
+    @Test
+    public void searchIndex_pageDisabled_shouldAddAllKeysToNonIndexable() {
+        final Context appContext = RuntimeEnvironment.application;
+        new DevelopmentSettingsEnabler(appContext, null /* lifecycle */)
+                .disableDevelopmentSettings();
+
+        final List<String> nonIndexableKeys =
+                DevelopmentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(appContext);
+
+        assertThat(nonIndexableKeys).contains("development_prefs_screen");
+    }
+
+    @Test
+    public void searchIndex_pageEnabled_shouldNotAddKeysToNonIndexable() {
+        final Context appContext = RuntimeEnvironment.application;
+        new DevelopmentSettingsEnabler(appContext, null /* lifecycle */)
+                .enableDevelopmentSettings();
+
+        final List<String> nonIndexableKeys =
+                DevelopmentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(appContext);
+
+        assertThat(nonIndexableKeys).doesNotContain("development_prefs_screen");
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
index 9a1a3b6..2f0f261 100644
--- a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
@@ -33,8 +33,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.shadows.ShadowToast;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
index d9c17bc..45e457b 100644
--- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
@@ -23,16 +23,14 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.os.UserManager;
 import android.provider.Settings.Global;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedSwitchPreference;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
index b54fc53..3bba438 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
@@ -17,10 +17,9 @@
 
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.os.SystemProperties;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
@@ -31,7 +30,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowSystemProperties;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 4475d18..7601f8a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -27,11 +27,11 @@
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.development.DevelopmentSettings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.search2.DatabaseIndexingManager;
+import com.android.settings.search.DatabaseIndexingManager;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -41,7 +41,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
 import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
index ea60e4c..108d342 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
@@ -21,7 +21,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
index 7b2b198..951d8c7 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
index 1cbd147..dfc1a0c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 import android.app.Fragment;
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
index 732ba22..5a4d988 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
@@ -20,9 +20,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
index 245d7d6..8e8da51 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
@@ -21,7 +21,7 @@
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
index 8d47135..10e4958 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
@@ -17,7 +17,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
index 1196833..6151ca0 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
index 9ac9eb4..ca6a33a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
@@ -28,10 +28,9 @@
 import android.view.MenuItem;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
-import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
index 87e8e1b..4ea33ee 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
index bf9c412..18ef003 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/SerialNumberPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
index 0c9988b..b2d259a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
@@ -25,7 +25,7 @@
 import android.os.storage.StorageManager;
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.CategoryKey;
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
index 6cb8f58..a154c03 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
@@ -25,7 +25,7 @@
 import android.widget.ProgressBar;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
index 3ea8016..b0f464c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
@@ -23,7 +23,7 @@
 
 import android.util.SparseArray;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
 import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
index 17abab1..5e95a61 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
@@ -17,6 +17,12 @@
 package com.android.settings.deviceinfo;
 
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.app.usage.StorageStatsManager;
 import android.icu.text.NumberFormat;
@@ -24,7 +30,7 @@
 import android.text.format.Formatter;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
@@ -41,12 +47,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class StorageSettingsTest {
@@ -78,10 +78,10 @@
         when(volumeInfo.isMountedReadable()).thenReturn(true);
         when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
         when(mStorageManagerVolumeProvider.getTotalBytes(
-                        any(StorageStatsManager.class), any(VolumeInfo.class)))
+                        nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
                 .thenReturn(500L);
         when(mStorageManagerVolumeProvider.getFreeBytes(
-                        any(StorageStatsManager.class), any(VolumeInfo.class)))
+                        nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
                 .thenReturn(0L);
 
         ReflectionHelpers.setField(
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
index 30c6dc9..5c62220 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
index 8529c5d..ce384a5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
@@ -16,28 +16,26 @@
 
 package com.android.settings.deviceinfo;
 
-import android.content.Context;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.hardware.usb.UsbManager;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.usb.UsbManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UsbBackendTest {
@@ -70,13 +68,7 @@
         usbBackend.getCurrentMode();
 
         verify(mContext).registerReceiver(eq(null),
-            argThat(new ArgumentMatcher<IntentFilter>() {
-                @Override
-                public boolean matches(Object i) {
-                    final IntentFilter intentFilter = (IntentFilter) i;
-                    return intentFilter != null &&
-                        UsbManager.ACTION_USB_STATE.equals(intentFilter.getAction(0));
-                }
-            }));
+            argThat(intentFilter -> intentFilter != null &&
+                UsbManager.ACTION_USB_STATE.equals(intentFilter.getAction(0))));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
index d9c474d..1817bfb 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbModeChooserActivityTest.java
@@ -22,7 +22,7 @@
 
 import android.widget.TextView;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index ee8e7d1..faf8b39 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -19,7 +19,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -36,7 +35,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
@@ -169,4 +168,23 @@
 
         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/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
index dc1c286..9b4f30e 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -33,7 +33,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.util.SparseArray;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.UserManagerWrapper;
 import com.android.settings.core.PreferenceController;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index 3ad3783..0d6a4d7 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -16,11 +16,12 @@
 package com.android.settings.deviceinfo.storage;
 
 
-import static com.google.common.truth.Truth.assertThat;
 import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -43,7 +44,7 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ManageApplications;
@@ -119,7 +120,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         assertThat(intent.getType()).isEqualTo("image/*");
@@ -134,7 +135,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
         Intent intent = argumentCaptor.getValue();
 
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -161,7 +162,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -182,20 +183,20 @@
 
     @Test
     public void testClickFiles() {
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         mPreference.setKey("pref_files");
         mController.handlePreferenceTreeClick(mPreference);
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         Intent browseIntent = mVolume.buildBrowseIntent();
         assertThat(intent.getAction()).isEqualTo(browseIntent.getAction());
         assertThat(intent.getData()).isEqualTo(browseIntent.getData());
         verify(mMetricsFeatureProvider, times(1)).action(
-                any(Context.class), eq(MetricsEvent.STORAGE_FILES));
+                nullable(Context.class), eq(MetricsEvent.STORAGE_FILES));
     }
 
     @Test
@@ -205,7 +206,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -223,7 +224,7 @@
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
-                any(UserHandle.class));
+                nullable(UserHandle.class));
 
         Intent intent = argumentCaptor.getValue();
         assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -240,7 +241,7 @@
         assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
 
         verify(mFragment.getFragmentManager().beginTransaction()).add(
-                any(PrivateVolumeSettings.SystemInfoFragment.class), anyString());
+                nullable(PrivateVolumeSettings.SystemInfoFragment.class), nullable(String.class));
     }
 
     @Test
@@ -297,19 +298,19 @@
     @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 @@
 
         mController.setUserId(new UserHandle(10));
 
-        verify(audio, times(2)).setIcon(any(Drawable.class));
-        verify(video, times(2)).setIcon(any(Drawable.class));
-        verify(image, times(2)).setIcon(any(Drawable.class));
-        verify(games, times(2)).setIcon(any(Drawable.class));
-        verify(apps, times(2)).setIcon(any(Drawable.class));
-        verify(system, times(2)).setIcon(any(Drawable.class));
-        verify(files, times(2)).setIcon(any(Drawable.class));
+        verify(audio, times(2)).setIcon(nullable(Drawable.class));
+        verify(video, times(2)).setIcon(nullable(Drawable.class));
+        verify(image, times(2)).setIcon(nullable(Drawable.class));
+        verify(games, times(2)).setIcon(nullable(Drawable.class));
+        verify(apps, times(2)).setIcon(nullable(Drawable.class));
+        verify(system, times(2)).setIcon(nullable(Drawable.class));
+        verify(files, times(2)).setIcon(nullable(Drawable.class));
     }
 
     @Test
@@ -359,7 +360,7 @@
         when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
                 .thenReturn(files);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         when(mVolume.isMountedReadable()).thenReturn(true);
 
         mController.displayPreference(screen);
@@ -388,7 +389,7 @@
         when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
                 .thenReturn(files);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         when(mVolume.isMountedReadable()).thenReturn(false);
 
         mController.displayPreference(screen);
@@ -417,7 +418,7 @@
         when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
                 .thenReturn(files);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(null);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(null);
 
         mController.displayPreference(screen);
 
@@ -445,11 +446,11 @@
         when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
                 .thenReturn(files);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         when(mVolume.isMountedReadable()).thenReturn(true);
 
         mController.displayPreference(screen);
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(null);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(null);
         mController.setVolume(mVolume);
 
         verify(screen).removePreference(files);
@@ -480,7 +481,7 @@
         // This will hide it initially.
         mController.displayPreference(screen);
 
-        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
         when(mVolume.isMountedReadable()).thenReturn(true);
 
         // And we bring it back.
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
index 6492f67..bd40240 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
@@ -27,22 +27,22 @@
 
 import android.content.Context;
 import android.os.storage.VolumeInfo;
-import android.provider.Settings;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -53,11 +53,14 @@
 import java.io.File;
 
 import static com.android.settings.TestUtils.KILOBYTE;
-import static com.android.settings.TestUtils.MEGABYTE;
 import static com.android.settings.TestUtils.GIGABYTE;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+        SettingsShadowResources.class,
+        SettingsShadowResources.SettingsShadowTheme.class
+})
 public class StorageSummaryDonutPreferenceControllerTest {
     private Context mContext;
     private StorageSummaryDonutPreferenceController mController;
@@ -68,6 +71,8 @@
 
     @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);
@@ -82,6 +87,11 @@
         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/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
index 2199824..db7c9f7 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -34,7 +34,7 @@
 import android.util.SparseArray;
 
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.UserManagerWrapper;
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
new file mode 100644
index 0000000..3869807
--- /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 0000000..242a05d
--- /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 0000000..2933517
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {ShadowSecureSettings.class})
+public class AmbientDisplayPreferenceControllerTest {
+
+    @Mock Context mContext;
+    @Mock AmbientDisplayConfiguration mConfig;
+    @Mock Preference mPreference;
+
+    AmbientDisplayPreferenceController mController;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mController = new AmbientDisplayPreferenceController(mContext, mConfig, "key");
+    }
+
+    @Test
+    public void isAvailable_available() throws Exception {
+        when(mConfig.available()).thenReturn(true);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_unavailable() throws Exception {
+        when(mConfig.available()).thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void updateState_alwaysOn() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.ambient_display_screen_summary_always_on);
+    }
+
+    @Test
+    public void updateState_notifications() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.ambient_display_screen_summary_notifications);
+    }
+
+    @Test
+    public void updateState_gestures() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
+        when(mConfig.enabled(anyInt())).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.switch_on_text);
+    }
+
+    @Test
+    public void updateState_off() throws Exception {
+        when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnDoubleTapEnabled(anyInt())).thenReturn(false);
+        when(mConfig.pulseOnPickupEnabled(anyInt())).thenReturn(false);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(R.string.switch_off_text);
+    }
+
+    @Test
+    public void getPreferenceKey() throws Exception {
+        assertThat(mController.getPreferenceKey()).isEqualTo("key");
+    }
+
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
index 6d8696f..02f46f2 100644
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -16,13 +16,15 @@
 
 package com.android.settings.display;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.gestures.DoubleTapPowerPreferenceController;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -79,13 +81,25 @@
     }
 
     @Test
-    public void testPreferenceController_CorrectPayload() {
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        mController = new AutoBrightnessPreferenceController(context, PREFERENCE_KEY);
-        InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
-        assertThat(payload.settingsUri).isEqualTo("screen_brightness_mode");
-        assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SYSTEM);
-        assertThat(payload.valueMap.get(1)).isEqualTo(true);
-        assertThat(payload.valueMap.get(0)).isEqualTo(false);
+    public void testSetValue_updatesCorrectly() {
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, 0);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.System.getInt(resolver, SCREEN_BRIGHTNESS_MODE, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testGetValue_correctValueReturned() {
+        int currentValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, currentValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
new file mode 100644
index 0000000..6d9cbab
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowSystemSettings;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AutoRotatePreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+    private Lifecycle mLifecycle;
+    private SwitchPreference mPreference;
+    private ContentResolver mContentResolver;
+    private AutoRotatePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mContentResolver = RuntimeEnvironment.application.getContentResolver();
+        mLifecycle = new Lifecycle();
+        mPreference = new SwitchPreference(RuntimeEnvironment.application);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+
+        mController = new AutoRotatePreferenceController(mContext, mLifecycle);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowSystemSettings.reset();
+    }
+
+    @Test
+    public void isAvailableWhenPolicyAllows() {
+        assertThat(mController.isAvailable()).isFalse();
+
+        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
+        when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
+        Settings.System.putInt(mContentResolver,
+                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @Config(shadows = ShadowSystemSettings.class)
+    public void updatePreference_settingsIsOff_shouldTurnOffToggle() {
+        Settings.System.putIntForUser(mContentResolver,
+                Settings.System.ACCELEROMETER_ROTATION, 0, UserHandle.USER_CURRENT);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    @Config(shadows = ShadowSystemSettings.class)
+    public void updatePreference_settingsIsOn_shouldTurnOnToggle() {
+        Settings.System.putIntForUser(mContentResolver,
+                Settings.System.ACCELEROMETER_ROTATION, 1, UserHandle.USER_CURRENT);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
index 792b853..73c5374 100644
--- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
@@ -21,7 +21,7 @@
 
 import android.content.Context;
 import android.provider.Settings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
new file mode 100644
index 0000000..d35adef
--- /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 0000000..00d910e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.display;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ColorModePreferenceControllerTest {
+    @Mock
+    private ColorModePreferenceController.ConfigurationWrapper mConfigWrapper;
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Context mContext;
+    @Mock
+    private IBinder mSurfaceFlinger;
+
+    private ColorModePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        SettingsShadowSystemProperties.clear();
+
+        mController = new ColorModePreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mSurfaceFlinger", mSurfaceFlinger);
+        ReflectionHelpers.setField(mController, "mConfigWrapper", mConfigWrapper);
+
+        when(mConfigWrapper.isScreenWideColorGamut()).thenReturn(true);
+
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void shouldCheckPreference() {
+        SettingsShadowSystemProperties.set(
+                ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION,
+                Float.toString(ColorModePreferenceController.COLOR_SATURATION_VIVID));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void shouldUncheckPreference() {
+        SettingsShadowSystemProperties.set(
+                ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION,
+                Float.toString(ColorModePreferenceController.COLOR_SATURATION_DEFAULT));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void shouldBoostSaturationOnCheck() {
+        mController.onPreferenceChange(mPreference, true);
+
+        String saturation = SettingsShadowSystemProperties
+                .get(ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION);
+        assertThat(saturation)
+                .isEqualTo(Float.toString(ColorModePreferenceController.COLOR_SATURATION_VIVID));
+    }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void shouldResetSaturationOnUncheck() {
+        mController.onPreferenceChange(mPreference, false);
+
+        String saturation = SettingsShadowSystemProperties
+                .get(ColorModePreferenceController.PERSISTENT_PROPERTY_SATURATION);
+        assertThat(saturation)
+                .isEqualTo(Float.toString(ColorModePreferenceController.COLOR_SATURATION_DEFAULT));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
index 2c0f4a7..3d99f65 100644
--- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -21,20 +21,25 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.support.v7.preference.ListPreference;
+
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.display.ThemePreferenceController.OverlayManager;
+import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -45,33 +50,65 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ThemePreferenceControllerTest {
 
-    @Mock
-    private ListPreference mPreference;
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
     private PackageManager mPackageManager;
     @Mock
     private ApplicationInfo mApplicationInfo;
+    @Mock
+    private ListPreference mPreference;
 
     private ThemePreferenceController mController;
 
     @Before
     public void setUp() throws NameNotFoundException {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
         when(mPackageManager.getApplicationInfo(any(), anyInt())).thenReturn(mApplicationInfo);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mContext.getString(R.string.default_theme))
+                .thenReturn(RuntimeEnvironment.application.getString(R.string.default_theme));
+
         mController = spy(new ThemePreferenceController(mContext, mock(OverlayManager.class)));
     }
 
     @Test
-    public void updateState_themeSet_shouldSetPreferenceValue() {
-        final String[] themes = {"Theme1", "Theme2"};
-        doReturn("Theme1").when(mController).getCurrentTheme();
+    public void updateState_themeSet_shouldSetPreferenceValue() throws NameNotFoundException {
+        final String pkg1 = "pkg1.theme1";
+        final String pkg2 = "pkg2.theme2";
+        final String themeLabel1 = "Theme1";
+        final String themeLabel2 = "Theme2";
+        final String[] themes = {pkg1, pkg2};
+        doReturn("pkg1.theme1").when(mController).getCurrentTheme();
         doReturn(themes).when(mController).getAvailableThemes();
+        when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager))
+                .thenReturn(themeLabel1)
+                .thenReturn(themeLabel2);
 
         mController.updateState(mPreference);
 
-        verify(mPreference).setValue("Theme1");
+        verify(mPreference).setSummary(themeLabel1);
+        verify(mPreference).setValue(pkg1);
+    }
+
+    @Test
+    public void updateState_themeNull_shouldSetDefaultSummary() throws NameNotFoundException {
+        final String pkg1 = "pkg1.theme1";
+        final String pkg2 = "pkg2.theme2";
+        final String themeLabel1 = "Theme1";
+        final String themeLabel2 = "Theme2";
+        final String[] themes = {pkg1, pkg2};
+        doReturn(null).when(mController).getCurrentTheme();
+        doReturn(themes).when(mController).getAvailableThemes();
+        when(mPackageManager.getApplicationInfo(anyString(), anyInt()).loadLabel(mPackageManager))
+                .thenReturn(themeLabel1)
+                .thenReturn(themeLabel2);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference)
+                .setSummary(RuntimeEnvironment.application.getString(R.string.default_theme));
+        verify(mPreference).setValue(null);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
index 2ebad46..480e41f 100644
--- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.provider.Settings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.TimeoutListPreference;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
index 56d4c47..191a8fb 100644
--- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
+++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
@@ -25,7 +25,7 @@
 import android.provider.Settings;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
new file mode 100644
index 0000000..1419ad5
--- /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 0000000..bd25d92
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.UserManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+import java.util.ArrayList;
+import java.util.Arrays;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CurrentDreamPickerTest {
+    private static String COMPONENT_KEY = "mocked_component_name_string";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private DreamBackend mBackend;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private UserManager mUserManager;
+    private CurrentDreamPicker mPicker;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        FakeFeatureFactory.setupForTest(mActivity);
+
+        mPicker = new CurrentDreamPicker();
+        mPicker.onAttach((Context)mActivity);
+
+        ReflectionHelpers.setField(mPicker, "mBackend", mBackend);
+    }
+
+    @Test
+    public void getDefaultShouldReturnActiveDream() {
+        ComponentName mockComponentName = mock(ComponentName.class);
+        when(mockComponentName.flattenToString()).thenReturn(COMPONENT_KEY);
+        when(mBackend.getActiveDream()).thenReturn(mockComponentName);
+
+        assertThat(mPicker.getDefaultKey()).isEqualTo(COMPONENT_KEY);
+    }
+
+    @Test
+    public void setDefaultShouldUpdateActiveDream() {
+        DreamInfo mockInfo = mock(DreamInfo.class);
+        ComponentName mockName = mock(ComponentName.class);
+
+        mockInfo.componentName = mockName;
+        when(mockName.flattenToString()).thenReturn(COMPONENT_KEY);
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mockInfo)));
+
+        mPicker.setDefaultKey(COMPONENT_KEY);
+
+        verify(mBackend).setActiveDream(mockName);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
new file mode 100644
index 0000000..e3493a1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.content.ComponentName;
+import android.content.Context;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.widget.GearPreference;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.DreamInfo;
+import java.util.ArrayList;
+import java.util.Arrays;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class CurrentDreamPreferenceControllerTest {
+    private static String TAG = "CurrentDreamPreferenceControllerTest";
+
+    private CurrentDreamPreferenceController mController;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private DreamBackend mBackend;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private DreamInfo mDreamInfo;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new CurrentDreamPreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void isDisabledIfNoDreamsAvailable() {
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(0));
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isEnabledIfDreamsAvailable() {
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void gearShowsIfActiveDreamInfoHasOptions() {
+        mDreamInfo.settingsComponentName = mock(ComponentName.class);
+        mDreamInfo.isActive = true;
+
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
+
+        GearPreference mockPref = mock(GearPreference.class);
+        ArgumentCaptor<GearPreference.OnGearClickListener> captor =
+                ArgumentCaptor.forClass(GearPreference.OnGearClickListener.class);
+
+        // verify that updateState sets a non-null gear click listener
+        mController.updateState(mockPref);
+        verify(mockPref).setOnGearClickListener(captor.capture());
+        captor.getAllValues().forEach(listener -> assertThat(listener).isNotNull());
+    }
+
+    @Test
+    public void gearHidesIfActiveDreamInfoHasNoOptions() {
+        mDreamInfo.settingsComponentName = null;
+        mDreamInfo.isActive = true;
+
+        when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
+
+        GearPreference mockPref = mock(GearPreference.class);
+        ArgumentCaptor<GearPreference.OnGearClickListener> captor =
+                ArgumentCaptor.forClass(GearPreference.OnGearClickListener.class);
+
+        // setting a null onGearClickListener removes the gear from view
+        mController.updateState(mockPref);
+        verify(mockPref).setOnGearClickListener(captor.capture());
+        captor.getAllValues().forEach(listener -> assertThat(listener).isNull());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
new file mode 100644
index 0000000..73526e5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.content.Context;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.WhenToDream;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DreamSettingsTest {
+    private static final List<String> KEYS = Arrays.asList(
+            DreamSettings.WHILE_CHARGING_ONLY,
+            DreamSettings.WHILE_DOCKED_ONLY,
+            DreamSettings.EITHER_CHARGING_OR_DOCKED,
+            DreamSettings.NEVER_DREAM
+        );
+
+    private static final @WhenToDream int[] SETTINGS = {
+                DreamBackend.WHILE_CHARGING,
+                DreamBackend.WHILE_DOCKED,
+                DreamBackend.EITHER,
+                DreamBackend.NEVER,
+        };
+
+    private static final int[] RES_IDS = {
+            R.string.screensaver_settings_summary_sleep,
+            R.string.screensaver_settings_summary_dock,
+            R.string.screensaver_settings_summary_either_long,
+            R.string.screensaver_settings_summary_never
+    };
+
+    @Test
+    public void getSettingFromPrefKey() {
+        for (int i = 0; i < KEYS.size(); i++) {
+            assertThat(DreamSettings.getSettingFromPrefKey(KEYS.get(i)))
+                    .isEqualTo(SETTINGS[i]);
+        }
+        // Default case
+        assertThat(DreamSettings.getSettingFromPrefKey("garbage value"))
+                .isEqualTo(DreamBackend.NEVER);
+    }
+
+    @Test
+    public void getKeyFromSetting() {
+        for (int i = 0; i < SETTINGS.length; i++) {
+            assertThat(DreamSettings.getKeyFromSetting(SETTINGS[i]))
+                    .isEqualTo(KEYS.get(i));
+        }
+        // Default
+        assertThat(DreamSettings.getKeyFromSetting(-1))
+                .isEqualTo(DreamSettings.NEVER_DREAM);
+    }
+
+    @Test
+    public void getDreamSettingDescriptionResId() {
+        for (int i = 0; i < SETTINGS.length; i++) {
+            assertThat(DreamSettings.getDreamSettingDescriptionResId(SETTINGS[i]))
+                    .isEqualTo(RES_IDS[i]);
+        }
+        // Default
+        assertThat(DreamSettings.getDreamSettingDescriptionResId(-1))
+                .isEqualTo(R.string.screensaver_settings_summary_never);
+    }
+
+    @Test
+    public void summaryText_whenDreamsAreOff() {
+        DreamBackend mockBackend = mock(DreamBackend.class);
+        Context mockContext = mock(Context.class);
+        when(mockBackend.isEnabled()).thenReturn(false);
+
+        assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext))
+                .isEqualTo(mockContext.getString(R.string.screensaver_settings_summary_off));
+    }
+
+    @Test
+    public void summaryTest_WhenDreamsAreOn() {
+        final String fakeName = "test_name";
+        DreamBackend mockBackend = mock(DreamBackend.class);
+        Context mockContext = mock(Context.class);
+        when(mockBackend.isEnabled()).thenReturn(true);
+        when(mockBackend.getActiveDreamName()).thenReturn(fakeName);
+
+        assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext))
+                .isEqualTo(fakeName);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
new file mode 100644
index 0000000..444591a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settingslib.dream.DreamBackend;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class StartNowPreferenceControllerTest {
+    private StartNowPreferenceController mController;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private LayoutPreference mLayoutPref;
+    @Mock
+    private Button mButton;
+    @Mock
+    private DreamBackend mBackend;
+
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new StartNowPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mLayoutPref);
+        when(mLayoutPref.findViewById(R.id.dream_start_now_button)).thenReturn(mButton);
+
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void setsOnClickListenerForStartNow() {
+        ArgumentCaptor<OnClickListener> captor =
+                ArgumentCaptor.forClass(Button.OnClickListener.class);
+
+        mController.displayPreference(mScreen);
+        verify(mButton).setOnClickListener(captor.capture());
+        assertThat(captor.getValue()).isNotNull();
+    }
+
+    @Test
+    public void buttonIsDisabledWhenNeverDreaming() {
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.NEVER);
+
+        mController.updateState(mLayoutPref);
+        verify(mButton).setEnabled(false);
+    }
+
+    @Test
+    public void buttonIsEnabledWhenDreamIsAvailable() {
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.EITHER);
+
+        mController.updateState(mLayoutPref);
+        verify(mButton).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
new file mode 100644
index 0000000..bafc2d4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.UserManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.dream.DreamBackend;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WhenToDreamPickerTest {
+    private WhenToDreamPicker mPicker;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private DreamBackend mBackend;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private UserManager mUserManager;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        FakeFeatureFactory.setupForTest(mActivity);
+
+        mPicker = new WhenToDreamPicker();
+        mPicker.onAttach((Context)mActivity);
+
+        ReflectionHelpers.setField(mPicker, "mBackend", mBackend);
+    }
+
+    @Test
+    public void getDefaultKeyReturnsCurrentWhenToDreamSetting() {
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.WHILE_CHARGING);
+        assertThat(mPicker.getDefaultKey())
+                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING));
+
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.WHILE_DOCKED);
+        assertThat(mPicker.getDefaultKey())
+                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED));
+
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.EITHER);
+        assertThat(mPicker.getDefaultKey())
+                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.EITHER));
+
+        when(mBackend.getWhenToDreamSetting()).thenReturn(DreamBackend.NEVER);
+        assertThat(mPicker.getDefaultKey())
+                .isEqualTo(DreamSettings.getKeyFromSetting(DreamBackend.NEVER));
+    }
+
+    @Test
+    public void setDreamWhileCharging() {
+        String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING);
+        mPicker.setDefaultKey(key);
+        verify(mBackend).setWhenToDream(DreamBackend.WHILE_CHARGING);
+    }
+
+    @Test
+    public void setDreamWhileDocked() {
+        String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED);
+        mPicker.setDefaultKey(key);
+        verify(mBackend).setWhenToDream(DreamBackend.WHILE_DOCKED);
+    }
+
+    @Test
+    public void setDreamWhileChargingOrDocked() {
+        String key = DreamSettings.getKeyFromSetting(DreamBackend.EITHER);
+        mPicker.setDefaultKey(key);
+        verify(mBackend).setWhenToDream(DreamBackend.EITHER);
+    }
+
+    @Test
+    public void setDreamNever() {
+        String key = DreamSettings.getKeyFromSetting(DreamBackend.NEVER);
+        mPicker.setDefaultKey(key);
+        verify(mBackend).setWhenToDream(DreamBackend.NEVER);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
new file mode 100644
index 0000000..2acf82b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dream;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.WhenToDream;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WhenToDreamPreferenceControllerTest {
+    private WhenToDreamPreferenceController mController;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private DreamBackend mBackend;
+
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mController = new WhenToDreamPreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void updateSummary() {
+        // Don't have to test the other settings because DreamSettings tests that all
+        // @WhenToDream values map to the correct ResId
+        final @WhenToDream int testSetting = DreamBackend.WHILE_CHARGING;
+        final Preference mockPref = mock(Preference.class);
+        when(mockPref.getContext()).thenReturn(mContext);
+        when(mBackend.getWhenToDreamSetting()).thenReturn(testSetting);
+        final String expectedString =
+                mContext.getString(DreamSettings.getDreamSettingDescriptionResId(testSetting));
+
+        mController.updateState(mockPref);
+        verify(mockPref).setSummary(expectedString);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
index b5d6b7a..111e503 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
@@ -16,9 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import android.content.Context;
-
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
index 0281ce5..491fcdb 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.Manifest;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
index d556296..01a13d2 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.Manifest;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
index e2a45ec..fed1631 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
@@ -18,7 +18,7 @@
 
 import android.Manifest;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
index 4da1cd2..a209a46 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
@@ -16,12 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import android.Manifest;
-import android.content.Intent;
-import android.support.v7.preference.Preference;
-import android.text.TextUtils;
-
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
index 51c8a7b..045acf2 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import com.android.settings.R;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
index 4562711..b321652 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
index 1936f80..83ea399 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
@@ -23,7 +23,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.UserAppInfo;
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
index 56a6c62..0d22d2e 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.UserAppInfo;
diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
index b9c838b..0b97353 100644
--- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
@@ -16,9 +16,8 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
index 2c0e320..00b3573 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
@@ -17,11 +17,11 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
+
 import com.android.settings.R;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index cf54bb0..cc6335f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -19,9 +19,8 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.PreferenceAvailabilityObserver;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 5e46216..474b278 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -29,7 +29,7 @@
 import android.text.SpannableStringBuilder;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.vpn2.ConnectivityManagerWrapper;
@@ -231,6 +231,7 @@
 
     @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 @@
 
         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/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
index 101a45a..7077ad5 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
@@ -17,11 +17,10 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index 16fa5ba..42639d6 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -16,14 +16,12 @@
 
 package com.android.settings.enterprise;
 
-import android.app.Application;
 import android.content.Context;
-import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.core.PreferenceController;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
index e5c877f..54a825e 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
@@ -21,7 +21,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
index 6a1a7f7..c38f56a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
@@ -28,7 +28,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.EnterpriseDefaultApps;
 import com.android.settings.applications.UserAppInfo;
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index 5eb59e7..bb21bf7 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
@@ -16,6 +16,14 @@
 
 package com.android.settings.enterprise;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -25,7 +33,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.EnterpriseDefaultApps;
 import com.android.settings.applications.UserAppInfo;
@@ -44,14 +52,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  * Tests for {@link EnterpriseSetDefaultAppsPreferenceController}.
  */
@@ -92,7 +93,7 @@
             final List<UserAppInfo> apps = new ArrayList<>(number);
             apps.add(new UserAppInfo(new UserInfo(i, "user." + i, UserInfo.FLAG_ADMIN), appInfo));
             when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(eq(i),
-                    argThat(new MatchesIntents(intents)))).thenReturn(apps);
+                    argThat(matchesIntents(intents)))).thenReturn(apps);
         }
     }
 
@@ -127,7 +128,7 @@
     @Test
     public void testIsAvailable() {
         when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(anyInt(),
-                anyObject())).thenReturn(new ArrayList<UserAppInfo>());
+                any(Intent[].class))).thenReturn(new ArrayList<>());
         assertThat(mController.isAvailable()).isFalse();
         verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, false);
 
@@ -148,28 +149,20 @@
         assertThat(mController.getPreferenceKey()).isEqualTo(KEY_DEFAULT_APPS);
     }
 
-    private static class MatchesIntents extends ArgumentMatcher<Intent[]> {
-        private final Intent[] mExpectedIntents;
-
-        MatchesIntents(Intent[] intents) {
-            mExpectedIntents = intents;
-        }
-
-        @Override
-        public boolean matches(Object object) {
-            final Intent[] actualIntents = (Intent[]) object;
+    private ArgumentMatcher<Intent[]> matchesIntents(Intent[] intents) {
+        return (Intent[] actualIntents) -> {
             if (actualIntents == null) {
                 return false;
             }
-            if (actualIntents.length != mExpectedIntents.length) {
+            if (actualIntents.length != intents.length) {
                 return false;
             }
-            for (int i = 0; i < mExpectedIntents.length; i++) {
-                if (!mExpectedIntents[i].filterEquals(actualIntents[i])) {
+            for (int i = 0; i < intents.length; i++) {
+                if (!intents[i].filterEquals(actualIntents[i])) {
                     return false;
                 }
             }
             return true;
-        }
+        };
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
index 1c92ea5..f77aef8 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.core.PreferenceAvailabilityObserver;
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
index b2f4fa7..db9182b 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
@@ -16,9 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import android.content.Context;
-
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
index 99c68f8..329c526 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
@@ -16,9 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import android.content.Context;
-
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
index 74c3de5..5d1b28a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
index 016d970..d5ce102 100644
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
index 3304b44..22d2a7d 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
@@ -17,11 +17,11 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
+
 import com.android.settings.R;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
index d3f5e97..2df05c2 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
@@ -17,11 +17,10 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
index 33360cc..43b793d 100644
--- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
@@ -16,9 +16,8 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
index 1205b0b..11e219a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
@@ -16,9 +16,8 @@
 
 package com.android.settings.enterprise;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
index 646774d..344914a 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 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.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 @@
     }
 
     @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 @@
         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 e8dc2b5..7b7e440 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
@@ -22,12 +22,11 @@
 import android.net.Uri;
 import android.view.TextureView.SurfaceTextureListener;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
new file mode 100644
index 0000000..bf2dfae
--- /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 0000000..801ee5d
--- /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 f4ed43e..61815f1 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 @@
 
 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.os.BatteryStats;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.view.View;
+import android.support.v7.preference.Preference;
+import android.support.v7.widget.RecyclerView;
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.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,23 +68,25 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
 import org.robolectric.util.ReflectionHelpers;
 
+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;
@@ -85,11 +95,9 @@
     private static final long PHONE_BACKGROUND_TIME_MS = 0;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Activity mActivity;
     @Mock
-    private AppHeaderController mAppHeaderController;
+    private EntityHeaderController mEntityHeaderController;
     @Mock
     private LayoutPreference mHeaderPreference;
     @Mock
@@ -108,13 +116,28 @@
     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);
 
@@ -122,21 +145,27 @@
         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(mLoaderManager).when(mFragment).getLoaderManager();
 
-        doReturn(mAppHeaderController).when(mFeatureFactory.applicationFeatureProvider)
-                .newAppHeaderController(any(Fragment.class), any(View.class));
-        doReturn(mAppHeaderController).when(mAppHeaderController).setButtonActions(anyInt(),
-                anyInt());
-        doReturn(mAppHeaderController).when(mAppHeaderController).setIcon(any(Drawable.class));
-        doReturn(mAppHeaderController).when(mAppHeaderController).setIcon(any(
+        ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setRecyclerView(nullable(RecyclerView.class), nullable(Lifecycle.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setButtonActions(anyInt(), anyInt());
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setIcon(nullable(Drawable.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController).setIcon(nullable(
                 ApplicationsState.AppEntry.class));
-        doReturn(mAppHeaderController).when(mAppHeaderController).setLabel(anyString());
-        doReturn(mAppHeaderController).when(mAppHeaderController).setLabel(any(
-                ApplicationsState.AppEntry.class));
-        doReturn(mAppHeaderController).when(mAppHeaderController).setSummary(anyString());
-
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setLabel(nullable(String.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setLabel(nullable(String.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setLabel(nullable(ApplicationsState.AppEntry.class));
+        doReturn(mEntityHeaderController).when(mEntityHeaderController)
+                .setSummary(nullable(String.class));
 
         doReturn(UID).when(mBatterySipper).getUid();
         doReturn(APP_LABEL).when(mBatteryEntry).getLabel();
@@ -144,6 +173,8 @@
                 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;
@@ -156,18 +187,34 @@
 
         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
@@ -175,8 +222,8 @@
         mFragment.mAppEntry = null;
         mFragment.initHeader();
 
-        verify(mAppHeaderController).setIcon(any(Drawable.class));
-        verify(mAppHeaderController).setLabel(APP_LABEL);
+        verify(mEntityHeaderController).setIcon(nullable(Drawable.class));
+        verify(mEntityHeaderController).setLabel(APP_LABEL);
     }
 
     @Test
@@ -191,9 +238,9 @@
         mFragment.mAppEntry = mAppEntry;
         mFragment.initHeader();
 
-        verify(mAppHeaderController).setIcon(mAppEntry);
-        verify(mAppHeaderController).setLabel(mAppEntry);
-        verify(mAppHeaderController).setIsInstantApp(false);
+        verify(mEntityHeaderController).setIcon(mAppEntry);
+        verify(mEntityHeaderController).setLabel(mAppEntry);
+        verify(mEntityHeaderController).setIsInstantApp(false);
     }
 
     @Test
@@ -208,16 +255,16 @@
         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(
@@ -226,6 +273,8 @@
                 FOREGROUND_TIME_MS);
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
                 USAGE_PERCENT);
+        assertThat(mBundle.getParcelableArrayList(
+                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalies);
     }
 
     @Test
@@ -234,7 +283,7 @@
         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(
@@ -243,6 +292,8 @@
                 PHONE_BACKGROUND_TIME_MS);
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
                 USAGE_PERCENT);
+        assertThat(mBundle.getParcelableArrayList(
+                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isNull();
     }
 
     @Test
@@ -250,21 +301,25 @@
         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
@@ -273,24 +328,23 @@
         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]);
 
@@ -299,4 +353,61 @@
         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 b40cb9e..92df48e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
@@ -45,12 +45,12 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index 799dab9..a163a43 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -19,7 +19,7 @@
 import android.content.Intent;
 import android.os.BatteryManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.Utils;
 
@@ -32,7 +32,12 @@
 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 @@
     @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 @@
         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 04bb2cf..013d379 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -17,28 +17,26 @@
 
 package com.android.settings.fuelgauge;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.BatteryManager;
-import android.support.v7.preference.Preference;
+import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
-import com.android.settingslib.BatteryInfo;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,13 +45,24 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
         sdk = TestConfig.SDK_VERSION,
         shadows = {
                 SettingsShadowResources.class,
                 SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowDynamicIndexableContentMonitor.class
+                ShadowDynamicIndexableContentMonitor.class,
+                ShadowEntityHeaderController.class
         })
 public class BatteryHeaderPreferenceControllerTest {
     private static final int BATTERY_LEVEL = 60;
@@ -61,29 +70,41 @@
     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);
@@ -92,10 +113,17 @@
 
         mBatteryInfo.batteryLevel = BATTERY_LEVEL;
 
-        mController = new BatteryHeaderPreferenceController(mContext);
+        mController = new BatteryHeaderPreferenceController(
+                mContext, mActivity, mPreferenceFragment, mLifecycle);
         mController.mBatteryMeterView = mBatteryMeterView;
-        mController.mTimeText = mTimeText;
-        mController.mSummary = mSummary;
+        mController.mBatteryPercentText = mBatteryPercentText;
+        mController.mSummary1 = mSummary;
+        mController.mSummary2 = mSummary2;
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEntityHeaderController.reset();
     }
 
     @Test
@@ -138,4 +166,24 @@
 
         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 221408d..0d03512 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
@@ -15,18 +15,24 @@
  */
 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.os.PowerManager;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settingslib.BatteryInfo;
-import com.android.settingslib.graph.UsageView;
+import com.android.settings.graph.UsageView;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,21 +41,16 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import static org.mockito.AdditionalMatchers.not;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class
+        })
 public class BatteryHistoryPreferenceTest {
+    public static final String TEST_STRING = "test";
     @Mock
     private PreferenceViewHolder mViewHolder;
     @Mock
@@ -84,7 +85,29 @@
         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 0000000..796e63c
--- /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 0000000..9bd0b6f
--- /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/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
index cb37a6e..e3a94d2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.graphics.ColorFilter;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
index b3afbb4..77e3198 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
@@ -18,10 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -84,9 +82,9 @@
         final boolean handled = mController.handlePreferenceTreeClick(mPreference);
 
         assertThat(handled).isTrue();
-        verify(mSettingsActivity).startPreferencePanel(any(Fragment.class),
-                anyString(), any(Bundle.class), anyInt(), any(CharSequence.class),
-                any(Fragment.class), anyInt());
+        verify(mSettingsActivity).startPreferencePanel(nullable(Fragment.class),
+                nullable(String.class), nullable(Bundle.class), anyInt(),
+                nullable(CharSequence.class), nullable(Fragment.class), anyInt());
     }
 
     @Test
@@ -96,9 +94,9 @@
         final boolean handled = mController.handlePreferenceTreeClick(mPreference);
 
         assertThat(handled).isFalse();
-        verify(mSettingsActivity, never()).startPreferencePanel(any(Fragment.class),
-                anyString(), any(Bundle.class), anyInt(), any(CharSequence.class),
-                any(Fragment.class), anyInt());
+        verify(mSettingsActivity, never()).startPreferencePanel(nullable(Fragment.class),
+                nullable(String.class), nullable(Bundle.class), anyInt(),
+                nullable(CharSequence.class), nullable(Fragment.class), anyInt());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
index 9656381..c75a6a6 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 @@
 
 import android.content.Context;
 import android.os.PowerManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -77,6 +79,20 @@
         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 0000000..259bcd2
--- /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 0000000..1e173a2
--- /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 d19a4b2..5f8d7cf 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.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;
+    private BatteryUtils mBatteryUtils;
     @Mock
-    private Bundle mBundle;
-    @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 4ff1b7e..aa19055 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -15,14 +15,23 @@
  */
 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.SettingsRobolectricTestRunner;
+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.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 @@
     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 @@
     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 @@
     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 @@
                 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 @@
         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 @@
 
     @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 @@
         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 @@
 
     @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 @@
                 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/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
index d750382..dec445d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
@@ -29,7 +29,7 @@
 import android.content.DialogInterface;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
index a60bc65..d87020e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
new file mode 100644
index 0000000..806acf3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.fuelgauge;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.VectorDrawable;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class PowerGaugePreferenceTest {
+    private static final String SUBTITLE = "Summary";
+    private static final String CONTENT_DESCRIPTION = "Content description";
+    private Context mContext;
+    private PowerGaugePreference mPowerGaugePreference;
+    private View mRootView;
+    private View mWidgetView;
+    private PreferenceViewHolder mPreferenceViewHolder;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference_material_settings,
+                null);
+        mWidgetView = LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary,
+                null);
+        ((LinearLayout) mRootView.findViewById(android.R.id.widget_frame)).addView(mWidgetView);
+        mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
+
+        mPowerGaugePreference = new PowerGaugePreference(mContext);
+    }
+
+    @Test
+    public void testOnBindViewHolder_bindSubtitle() {
+        mPowerGaugePreference.setSubtitle(SUBTITLE);
+        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
+
+        assertThat(((TextView) mPreferenceViewHolder.findViewById(
+                R.id.widget_summary)).getText()).isEqualTo(SUBTITLE);
+    }
+
+    @Test
+    public void testOnBindViewHolder_showAnomaly_bindAnomalyIcon() {
+        mPowerGaugePreference.shouldShowAnomalyIcon(true);
+        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
+
+        final Drawable[] drawables = ((TextView) mPreferenceViewHolder.findViewById(
+                R.id.widget_summary)).getCompoundDrawablesRelative();
+
+        assertThat(drawables[0]).isInstanceOf(VectorDrawable.class);
+    }
+
+    @Test
+    public void testOnBindViewHolder_notShowAnomaly_bindAnomalyIcon() {
+        mPowerGaugePreference.shouldShowAnomalyIcon(false);
+        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
+
+        final Drawable[] drawables = ((TextView) mPreferenceViewHolder.findViewById(
+                R.id.widget_summary)).getCompoundDrawablesRelative();
+
+        assertThat(drawables[0]).isNull();
+    }
+
+    @Test
+    public void testOnBindViewHolder_bindContentDescription() {
+        mPowerGaugePreference.setContentDescription(CONTENT_DESCRIPTION);
+        mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
+
+        assertThat(mPreferenceViewHolder.findViewById(android.R.id.title).getContentDescription())
+                .isEqualTo(CONTENT_DESCRIPTION);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index 26cf7e0..bf89cac 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -20,23 +20,29 @@
 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.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.BatteryTestUtils;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.Utils;
 import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData;
@@ -81,14 +87,19 @@
     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 @@
         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 @@
         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 @@
     }
 
     @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 @@
         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 0000000..c992d0a
--- /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/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index 8e9febe..afda69f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -20,7 +20,7 @@
 import android.content.pm.PackageManager;
 import android.os.Process;
 import com.android.internal.os.BatterySipper;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 0610456..d76d64b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -15,17 +15,40 @@
  */
 package com.android.settings.fuelgauge;
 
-import android.app.Activity;
+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;
@@ -34,45 +57,32 @@
 import com.android.internal.os.BatteryStatsImpl;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.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}.
  */
@@ -89,6 +99,7 @@
     private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
     private static final String STUB_STRING = "stub_string";
     private static final int UID = 123;
+    private static final int UID_2 = 234;
     private static final int POWER_MAH = 100;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
@@ -103,6 +114,8 @@
     private static final double POWER_USAGE_PERCENTAGE = 50;
     private static final Intent ADDITIONAL_BATTERY_INFO_INTENT =
             new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
+    public static final String NEW_ML_EST_SUFFIX = "(New ML est)";
+    public static final String OLD_EST_SUFFIX = "(Old est)";
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
@@ -135,7 +148,17 @@
     @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;
@@ -145,6 +168,7 @@
     private PowerGaugePreference mPreference;
     private PowerGaugePreference mScreenUsagePref;
     private PowerGaugePreference mLastFullChargePref;
+    private SparseArray<List<Anomaly>> mAnomalySparseArray;
 
     @Before
     public void setUp() {
@@ -163,6 +187,7 @@
         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())
@@ -202,6 +227,7 @@
         mFragment.mScreenUsagePref = mScreenUsagePref;
         mFragment.mLastFullChargePref = mLastFullChargePref;
         mFragment.mBatteryUtils = spy(new BatteryUtils(mRealContext));
+        mFragment.mAppListGroup = mAppListGroup;
     }
 
     @Test
@@ -314,11 +340,10 @@
         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
@@ -326,11 +351,21 @@
         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) {
@@ -401,12 +436,6 @@
     }
 
     @Test
-    public void testCalculateRunningTimeBasedOnStatsType() {
-        assertThat(mFragment.calculateRunningTimeBasedOnStatsType()).isEqualTo(
-                TIME_SINCE_LAST_FULL_CHARGE_MS);
-    }
-
-    @Test
     public void testNonIndexableKeys_MatchPreferenceKeys() {
         final Context context = RuntimeEnvironment.application;
         final List<String> niks = PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER
@@ -434,6 +463,47 @@
     }
 
     @Test
+    public void testUpdateAnomalySparseArray() {
+        mFragment.mAnomalySparseArray = new SparseArray<>();
+        final List<Anomaly> anomalies = new ArrayList<>();
+        final Anomaly anomaly1 = new Anomaly.Builder().setUid(UID).build();
+        final Anomaly anomaly2 = new Anomaly.Builder().setUid(UID).build();
+        final Anomaly anomaly3 = new Anomaly.Builder().setUid(UID_2).build();
+        anomalies.add(anomaly1);
+        anomalies.add(anomaly2);
+        anomalies.add(anomaly3);
+
+        mFragment.updateAnomalySparseArray(anomalies);
+
+        assertThat(mFragment.mAnomalySparseArray.get(UID)).containsExactly(anomaly1, anomaly2);
+        assertThat(mFragment.mAnomalySparseArray.get(UID_2)).containsExactly(anomaly3);
+    }
+
+    @Test
+    public void testInitAnomalyDetectionIfPossible_detectionEnabled_init() {
+        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();
         mFragment.mShowAllApps = true;
@@ -445,6 +515,68 @@
         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 0000000..914cc2f
--- /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 0000000..1111804
--- /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 0000000..48749d5
--- /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 0000000..c0157ae
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge.anomaly;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AnomalyPreferenceTest {
+    @Anomaly.AnomalyType
+    private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final String DISPLAY_NAME = "app";
+    private static final int UID = 111;
+
+    private Context mContext;
+    private Anomaly mAnomaly;
+    private AnomalyPreference mAnomalyPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+
+        mAnomaly = new Anomaly.Builder()
+                .setType(ANOMALY_TYPE)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .setUid(UID)
+                .build();
+    }
+
+    @Test
+    public void testAnomalyPreference_containsCorrectData() {
+        mAnomalyPreference = new AnomalyPreference(mContext, mAnomaly);
+
+        assertThat(mAnomalyPreference.getTitle()).isEqualTo(DISPLAY_NAME);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
new file mode 100644
index 0000000..72d8b69
--- /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 0000000..13a5b31
--- /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 0000000..8cd5a06
--- /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 0000000..8db1a8c
--- /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 0000000..7e5fc4a
--- /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 0000000..89b1a16
--- /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 0000000..234dd12
--- /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 0000000..c06bddd
--- /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 0000000..f8d02ff
--- /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 0000000..d7682ea
--- /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 0000000..55be734
--- /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 e83e237..b2d3596 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
@@ -16,33 +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.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.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+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 java.util.ArrayList;
-import java.util.List;
-
-import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AssistGesturePreferenceControllerTest {
@@ -59,12 +63,13 @@
         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();
     }
 
@@ -79,7 +84,7 @@
         // 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();
     }
@@ -89,9 +94,44 @@
         // 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 229ef49..0000000
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
+++ /dev/null
@@ -1,101 +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.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
-import static android.provider.Settings.Secure.ASSIST_GESTURE_SENSITIVITY;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@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 4efc822..49fd214 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
@@ -20,7 +20,8 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+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 @@
 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 d7961e3..9c9a546 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -16,21 +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.SettingsRobolectricTestRunner;
+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.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+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;
 
@@ -94,4 +98,44 @@
 
         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/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
index f8c3367..b9635a7 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
@@ -18,7 +18,7 @@
 
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
index 442d11d..37f52de 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
@@ -16,20 +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.SettingsRobolectricTestRunner;
+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.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+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 +88,41 @@
 
         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/DoubleTapScreenSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
index 433ba46..3d56d71 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
@@ -18,7 +18,7 @@
 
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
index 35c48ec..236896a 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
@@ -18,7 +18,7 @@
 
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -30,7 +30,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index 7caf3fc..f9ac02e 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
@@ -39,14 +39,14 @@
 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 @@
     }
 
     @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 @@
         // 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 @@
         // 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 3dc6892..8b4ef61 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
@@ -21,10 +21,10 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.widget.VideoPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
index 46c0f65..833f016 100644
--- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
@@ -16,20 +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.SettingsRobolectricTestRunner;
+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.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+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;
@@ -85,4 +90,54 @@
 
         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 921a1be..2c4a1c4 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
@@ -18,7 +18,7 @@
 
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -30,7 +30,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
index cf26cb2..d4fc014 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
@@ -16,25 +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.SettingsRobolectricTestRunner;
+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.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+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)
@@ -43,6 +54,10 @@
 
     @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";
@@ -51,10 +66,27 @@
     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);
@@ -64,6 +96,8 @@
 
     @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);
@@ -73,6 +107,8 @@
 
     @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);
@@ -83,6 +119,8 @@
 
     @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);
@@ -90,4 +128,9 @@
 
         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 78dc27ac..e2ed14d 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
@@ -20,7 +20,7 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
 
@@ -35,7 +35,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java b/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
new file mode 100644
index 0000000..c9804d6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package com.android.settings.graph;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.Space;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BottomLabelLayoutTest {
+    private BottomLabelLayout mBottomLabelLayout;
+    private Context mContext;
+    private Space mSpace;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mBottomLabelLayout = new BottomLabelLayout(mContext, null);
+        mBottomLabelLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+        mSpace = new Space(mContext);
+        mSpace.setId(R.id.spacer);
+        mBottomLabelLayout.addView(mSpace);
+    }
+
+    @Test
+    public void testSetStacked_stackedTrue_layoutVertical() {
+        mBottomLabelLayout.setStacked(true);
+
+        assertThat(mBottomLabelLayout.getOrientation()).isEqualTo(LinearLayout.VERTICAL);
+        assertThat(mSpace.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testSetStacked_stackedFalse_layoutHorizontal() {
+        mBottomLabelLayout.setStacked(false);
+
+        assertThat(mBottomLabelLayout.getOrientation()).isEqualTo(LinearLayout.HORIZONTAL);
+        assertThat(mSpace.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
new file mode 100644
index 0000000..fbd6fd4
--- /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/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
index c1bd0e0..7d803f4 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.hardware.input.InputManager;
 import android.view.InputDevice;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
index 5fa2c0d..8f9b2c5 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
@@ -27,7 +27,7 @@
 import android.view.InputDevice;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowInputDevice;
 
diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
index 8ca7d64..4457cc0 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.view.textservice.TextServicesManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
index 1332445..fe2b0df 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
@@ -34,7 +34,7 @@
 import android.view.inputmethod.InputMethodManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index 6f5b6b0..b4a4638 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;
@@ -40,15 +32,15 @@
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -62,12 +54,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class LanguageAndInputSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
+    private Activity mActivity;
     @Mock
     private PackageManager mPackageManager;
     @Mock
@@ -85,16 +86,18 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
-        when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mock(InputManager.class));
-        when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mIm);
-        when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
+        FakeFeatureFactory.setupForTest(mActivity);
+        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
+        when(mActivity.getSystemService(Context.INPUT_SERVICE))
+                .thenReturn(mock(InputManager.class));
+        when(mActivity.getSystemService(Context.INPUT_SERVICE)).thenReturn(mIm);
+        when(mActivity.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
                 .thenReturn(mock(TextServicesManager.class));
-        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(mDpm);
-        when(mContext.getSystemService(Context.INPUT_METHOD_SERVICE)).thenReturn(mImm);
-        when((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
@@ -104,7 +107,8 @@
 
     @Test
     public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() {
-        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        final List<PreferenceController> controllers =
+                mFragment.getPreferenceControllers(mActivity);
         int lifecycleObserverCount = 0;
         for (PreferenceController controller : controllers) {
             if (controller instanceof LifecycleObserver) {
@@ -118,7 +122,8 @@
     @Test
 
     public void testGetPreferenceControllers_shouldAllBeCreated() {
-        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        final List<PreferenceController> controllers =
+                mFragment.getPreferenceControllers(mActivity);
 
         assertThat(controllers.isEmpty()).isFalse();
     }
@@ -151,12 +156,50 @@
     }
 
     @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/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
index e7367bb..4050dd1 100644
--- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
index 4908b49..e4b3cf2 100644
--- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
index d2032ed..3fc99d2 100644
--- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.speech.tts.TtsEngines;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.UserDictionarySettings;
 import com.android.settings.inputmethod.UserDictionaryList;
diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
index c7f76df..602bbd1 100644
--- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
@@ -1,12 +1,11 @@
 package com.android.settings.location;
 
 import android.content.Context;
-import android.os.UserManager;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -16,7 +15,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.any;
diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
index 2e00169..c7e0e0a 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.SettingsRobolectricTestRunner;
+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.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 @@
     @Mock
     private PreferenceScreen mScreen;
 
+    private Lifecycle mLifecycle;
     private LocationPreferenceController mController;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -54,7 +72,8 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mController = new LocationPreferenceController(mContext);
+        mLifecycle = new Lifecycle();
+        mController = new LocationPreferenceController(mContext, mLifecycle);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
     }
 
@@ -67,7 +86,7 @@
     public void updateState_shouldSetSummary() {
         mController.updateState(mPreference);
 
-        verify(mPreference).setSummary(anyString());
+        verify(mPreference).setSummary(nullable(String.class));
     }
 
     @Test
@@ -75,58 +94,115 @@
         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 1ae40aa..66e357b 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -24,9 +24,10 @@
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsWrapper;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -87,6 +88,7 @@
     }
 
     @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/MobilePlanPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
index 5827c8b..a84179d 100644
--- a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index d1c3207..7471632 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -19,15 +19,18 @@
 import android.provider.SearchIndexableResource;
 import android.view.Menu;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
@@ -36,18 +39,27 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class NetworkDashboardFragmentTest {
 
+    @Mock
+    private Context mContext;
+
     private NetworkDashboardFragment mFragment;
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
         mFragment = new NetworkDashboardFragment();
     }
 
@@ -75,7 +87,7 @@
 
         mFragment.onCreateOptionsMenu(null, null);
 
-        verify(resetController).buildMenuItem(any(Menu.class));
+        verify(resetController).buildMenuItem(nullable(Menu.class));
     }
 
     @Test
@@ -89,4 +101,58 @@
 
         assertThat(keys).containsAllIn(niks);
     }
-}
+
+    @Test
+    public void testSummaryProvider_hasMobileAndHotspot_shouldReturnMobileSummary() {
+        final MobileNetworkPreferenceController mobileNetworkPreferenceController =
+                mock(MobileNetworkPreferenceController.class);
+        final TetherPreferenceController tetherPreferenceController =
+                mock(TetherPreferenceController.class);
+
+        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
+        final SummaryLoader.SummaryProvider provider =
+                new NetworkDashboardFragment.SummaryProvider(mContext, summaryLoader,
+                        mobileNetworkPreferenceController, tetherPreferenceController);
+
+        provider.setListening(false);
+
+        verifyZeroInteractions(summaryLoader);
+
+        when(mobileNetworkPreferenceController.isAvailable()).thenReturn(true);
+        when(tetherPreferenceController.isAvailable()).thenReturn(true);
+
+        provider.setListening(true);
+
+        verify(mContext).getString(R.string.wifi_settings_title);
+        verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
+        verify(mContext).getString(R.string.network_dashboard_summary_hotspot);
+        verify(mContext).getString(R.string.network_dashboard_summary_mobile);
+        verify(mContext, times(3)).getString(R.string.join_many_items_middle, null, null);
+    }
+
+    @Test
+    public void testSummaryProvider_noMobileOrHotspot_shouldReturnSimpleSummary() {
+        final MobileNetworkPreferenceController mobileNetworkPreferenceController =
+                mock(MobileNetworkPreferenceController.class);
+        final TetherPreferenceController tetherPreferenceController =
+                mock(TetherPreferenceController.class);
+
+        final SummaryLoader summaryLoader = mock(SummaryLoader.class);
+        final SummaryLoader.SummaryProvider provider =
+                new NetworkDashboardFragment.SummaryProvider(mContext, summaryLoader,
+                        mobileNetworkPreferenceController, tetherPreferenceController);
+
+        provider.setListening(false);
+
+        verifyZeroInteractions(summaryLoader);
+
+        when(mobileNetworkPreferenceController.isAvailable()).thenReturn(false);
+        when(tetherPreferenceController.isAvailable()).thenReturn(false);
+
+        provider.setListening(true);
+
+        verify(mContext).getString(R.string.wifi_settings_title);
+        verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
+        verify(mContext).getString(R.string.join_many_items_middle, null, null);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
index ee6ef69..0b2be3a 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
@@ -27,7 +27,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
index eeb4131..4d8c626 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
index b1c88d5..792bdd3 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
@@ -25,7 +25,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
index 57dd8e6..0b1586e 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
@@ -28,7 +28,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
index aba1f77..9885bdf 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
@@ -30,7 +30,7 @@
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.widget.RadioButtonPreference;
 import com.google.android.collect.Lists;
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index cecc910..b8a6d28 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;
@@ -30,7 +29,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -78,6 +77,14 @@
     }
 
     @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);
         final AtomicReference<BluetoothPan> panRef =
@@ -161,7 +168,8 @@
         mController.onResume();
 
         verify(mContext).registerReceiver(
-            any(TetherPreferenceController.TetherBroadcastReceiver.class), any(IntentFilter.class));
+                any(TetherPreferenceController.TetherBroadcastReceiver.class),
+                any(IntentFilter.class));
     }
 
     @Test
@@ -172,7 +180,7 @@
         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 2a0b873..b7c4848 100644
--- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
@@ -25,9 +25,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
index c31ab40..172508d 100644
--- a/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/WifiCallingPreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.telephony.TelephonyManager;
 
 import com.android.ims.ImsManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 7e898fb..a82daf3 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -18,11 +18,11 @@
 package com.android.settings.nfc;
 
 import android.content.Context;
-
 import android.content.pm.PackageManager;
-import android.content.pm.PackageParser;
-import com.android.settings.SettingsRobolectricTestRunner;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,7 +33,6 @@
 import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -67,6 +66,6 @@
         when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
 
         List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
-        assertThat(niks).isNull();
+        assertThat(niks).isEmpty();
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
index 994582c..d33d734 100644
--- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.accounts.AccountRestrictionHelper;
 import com.android.settingslib.RestrictedPreference;
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
index 4ac9179..f4bd522 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.media.RingtoneManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
index a08ec17..7b0b033 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.media.AudioManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
index 618574c..c1a7d05 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.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.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 @@
 
         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 c547c63..58ba46b 100644
--- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
@@ -21,7 +21,7 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
@@ -32,7 +32,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
index fc9867e..ed9cc98 100644
--- a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
index 4cdf7c7..2b2d024 100644
--- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.Global;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
index e9410e6..4ec67e6 100644
--- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.provider.Settings.System;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
index bc6eb3a..58e5636 100644
--- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.Global;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
index 3350fb9..d6a277f 100644
--- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.Global;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
index 392bd2c..24f4b6c 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.content.pm.PackageManager;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.accounts.AccountRestrictionHelper;
 import com.android.settingslib.RestrictedPreference;
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
index 0124566..c3e887f 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.provider.Settings.Global;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
index 9944379..ca7fc44 100644
--- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.media.AudioManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -30,7 +30,6 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
index b0aa856..d3f66b9 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.notification;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -31,10 +35,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class NotificationAccessSettingsTest {
@@ -56,12 +56,12 @@
     @Test
     public void logSpecialPermissionChange() {
         mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW),
                 eq("app"));
 
         mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
+        verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY),
                 eq("app"));
     }
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
index d380900..97c0d94 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
@@ -23,7 +23,7 @@
 
 import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend.AppRow;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.robolectric.annotation.Config;
 
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
index 841367f..940a948 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.media.RingtoneManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
index e6d8a41..f919e7b 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
@@ -21,7 +21,7 @@
 import android.os.Vibrator;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
index 85e74b0..57ab4d3 100644
--- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.media.RingtoneManager;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
index 4780e5c..1a6d3d7 100644
--- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
@@ -19,12 +19,11 @@
 import android.app.NotificationManager;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.media.AudioManager;
 import android.os.Vibrator;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
index d680c38..e72ef53 100644
--- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
@@ -20,7 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.media.RingtoneManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
index 8963a5d..f94f8bf 100644
--- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.System;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
index 25581b9..307536d 100644
--- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
@@ -23,9 +23,9 @@
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,7 +40,7 @@
 
 import static com.android.settings.notification.SettingPref.TYPE_GLOBAL;
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index 547117b..59b7078 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -21,7 +21,7 @@
 import android.media.AudioManager;
 import android.os.UserManager;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowAudioHelper;
diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
index f530f66..eaf9bb5 100644
--- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.System;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -32,7 +32,6 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
index 440b69e..b0ab54b 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
@@ -24,7 +24,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.provider.Settings.System;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -36,7 +36,7 @@
 import org.robolectric.shadows.ShadowApplication;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
index 3bc1ffa..054309c 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import android.support.v7.preference.TwoStatePreference;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
index 581ed47..a1d9205 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
@@ -16,12 +16,18 @@
 
 package com.android.settings.notification;
 
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
-import android.preference.SeekBarVolumizer;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -31,13 +37,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class VolumeSeekBarPreferenceControllerTest {
@@ -56,7 +55,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        when(mScreen.findPreference(nullable(String.class))).thenReturn(mPreference);
         mController =
             new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback);
     }
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
new file mode 100644
index 0000000..b091cd3
--- /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 520e1f0..0c826ed 100644
--- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
@@ -16,6 +16,16 @@
 
 package com.android.settings.notification;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -28,7 +38,7 @@
 import com.android.settings.DefaultRingtonePreference;
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -38,16 +48,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WorkSoundPreferenceControllerTest {
@@ -94,9 +94,9 @@
 
     @Test
     public void isAvailable_managedProfileAndNotSingleVolume_shouldReturnTrue() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
 
         assertThat(mController.isAvailable()).isTrue();
@@ -104,9 +104,9 @@
 
     @Test
     public void isAvailable_noManagedProfile_shouldReturnFalse() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.USER_NULL);
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
 
         assertThat(mController.isAvailable()).isFalse();
@@ -114,9 +114,9 @@
 
     @Test
     public void isAvailable_singleVolume_shouldReturnFalse() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(true);
 
         assertThat(mController.isAvailable()).isFalse();
@@ -128,7 +128,7 @@
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.USER_NULL);
 
         // When the fragment first displays, the category should not appear.
@@ -137,7 +137,7 @@
 
         // However, when a managed profile is added later, the category should appear.
         mController.onResume();
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
         mController.onManagedProfileAdded(UserHandle.myUserId());
 
@@ -150,9 +150,9 @@
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
 
         // Which is in resumed state:
         mController.displayPreference(mScreen);
@@ -161,7 +161,7 @@
         verify(mWorkCategory, times(2)).setVisible(true);
 
         // When a managed profile is removed, the category should be hidden.
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.USER_NULL);
         mController.onManagedProfileRemoved(UserHandle.myUserId());
 
@@ -171,9 +171,9 @@
 
     @Test
     public void displayPreference_isAvailable_shouldShowPreferenceCategory() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
@@ -184,7 +184,7 @@
 
     @Test
     public void displayPreference_notAvailable_shouldHidePreferenceCategory() {
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.USER_NULL);
         when(mAudioHelper.isSingleVolume()).thenReturn(true);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
@@ -200,7 +200,7 @@
 
         mController.onPreferenceChange(preference, "hello");
 
-        verify(preference).setSummary(anyString());
+        verify(preference).setSummary(nullable(String.class));
     }
 
     @Test
@@ -208,9 +208,9 @@
         when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
         mController = new WorkSoundPreferenceController(mContext, mFragment, null, mAudioHelper);
 
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
@@ -234,9 +234,9 @@
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(UserHandle.myUserId());
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(false);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(false);
 
         // When resumed:
         mController.displayPreference(mScreen);
@@ -256,9 +256,9 @@
     @Test
     public void onResume_shouldSetUserIdToPreference() {
         final int managedProfileUserId = 10;
-        when(mAudioHelper.getManagedProfileId(any(UserManager.class)))
+        when(mAudioHelper.getManagedProfileId(nullable(UserManager.class)))
                 .thenReturn(managedProfileUserId);
-        when(mAudioHelper.isUserUnlocked(any(UserManager.class), anyInt())).thenReturn(true);
+        when(mAudioHelper.isUserUnlocked(nullable(UserManager.class), anyInt())).thenReturn(true);
         when(mAudioHelper.isSingleVolume()).thenReturn(false);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
         when(mAudioHelper.createPackageContextAsUser(anyInt())).thenReturn(mContext);
diff --git a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
index 854edcd..591378f 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
index 685390e..1d71a8a 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
@@ -22,7 +22,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
index 7a3742d..716e2b2 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
@@ -16,10 +16,11 @@
 
 package com.android.settings.notification;
 
+import android.app.NotificationManager;
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -29,8 +30,8 @@
 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 @@
         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 0000000..28b0264
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.password;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class
+        })
+public class ChooseLockGenericControllerTest {
+
+    private ChooseLockGenericController mController;
+
+    @Mock
+    private ManagedLockPasswordProvider mManagedLockPasswordProvider;
+
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new ChooseLockGenericController(
+                application,
+                0 /* userId */,
+                mDevicePolicyManager,
+                mManagedLockPasswordProvider);
+        SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, false);
+        SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, false);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void isScreenLockVisible_shouldRespectResourceConfig() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            // All locks except managed defaults to visible
+            assertThat(mController.isScreenLockVisible(lock)).named(lock + " visible")
+                    .isEqualTo(lock != ScreenLockType.MANAGED);
+        }
+
+        SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, true);
+        SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, true);
+        assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+                .isFalse();
+        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
+                .isFalse();
+    }
+
+    @Test
+    public void isScreenLockVisible_notCurrentUser_shouldHideSwipe() {
+        mController = new ChooseLockGenericController(application, 1 /* userId */);
+        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
+                .isFalse();
+    }
+
+    @Test
+    public void isScreenLockVisible_managedPasswordChoosable_shouldShowManaged() {
+        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+
+        assertThat(mController.isScreenLockVisible(ScreenLockType.MANAGED)).named("MANAGED visible")
+                .isTrue();
+    }
+
+    @Test
+    public void isScreenLockEnabled_lowerQuality_shouldReturnFalse() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality + 1))
+                    .named(lock + " enabled")
+                    .isFalse();
+        }
+    }
+
+    @Test
+    public void isScreenLockEnabled_equalQuality_shouldReturnTrue() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockEnabled(lock, lock.defaultQuality))
+                    .named(lock + " enabled")
+                    .isTrue();
+        }
+    }
+
+    @Test
+    public void isScreenLockEnabled_higherQuality_shouldReturnTrue() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality - 1))
+                    .named(lock + " enabled")
+                    .isTrue();
+        }
+    }
+
+    @Test
+    public void isScreenLockDisabledByAdmin_lowerQuality_shouldReturnTrue() {
+        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1))
+                    .named(lock + " disabledByAdmin")
+                    .isTrue();
+        }
+    }
+
+    @Test
+    public void isScreenLockDisabledByAdmin_equalQuality_shouldReturnFalse() {
+        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality))
+                    .named(lock + " disabledByAdmin")
+                    .isFalse();
+        }
+    }
+
+    @Test
+    public void isScreenLockDisabledByAdmin_higherQuality_shouldReturnFalse() {
+        doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1))
+                    .named(lock + " disabledByAdmin")
+                    .isFalse();
+        }
+    }
+
+    @Test
+    public void isScreenLockDisabledByAdmin_managedNotChoosable_shouldReturnTrue() {
+        doReturn(false).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
+        assertThat(mController.isScreenLockDisabledByAdmin(
+                ScreenLockType.MANAGED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
+                .named("MANANGED disabledByAdmin")
+                .isTrue();
+    }
+
+    @Test
+    public void getTitle_shouldContainEnumName() {
+        doReturn("MANAGED").when(mManagedLockPasswordProvider).getPickerOptionTitle(anyBoolean());
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(mController.getTitle(lock).toString())
+                    .containsMatch(Pattern.compile(lock.toString(), Pattern.CASE_INSENSITIVE));
+        }
+    }
+
+    @Test
+    public void getVisibleScreenLockTypes_qualitySomething_shouldReturnPatterPinPassword() {
+        assertThat(mController.getVisibleScreenLockTypes(
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false))
+                .isEqualTo(Arrays.asList(
+                        ScreenLockType.PATTERN,
+                        ScreenLockType.PIN,
+                        ScreenLockType.PASSWORD));
+    }
+
+    @Test
+    public void getVisibleScreenLockTypes_showDisabled_shouldReturnAllButManaged() {
+        assertThat(mController.getVisibleScreenLockTypes(
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, true))
+                .isEqualTo(Arrays.asList(
+                        ScreenLockType.NONE,
+                        ScreenLockType.SWIPE,
+                        ScreenLockType.PATTERN,
+                        ScreenLockType.PIN,
+                        ScreenLockType.PASSWORD));
+    }
+
+    @Test
+    public void upgradeQuality_noDpmRequirement_shouldReturnQuality() {
+        doReturn(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
+                .when(mDevicePolicyManager)
+                .getPasswordQuality(nullable(ComponentName.class), anyInt());
+
+        int upgradedQuality = mController.upgradeQuality(
+                DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
+        assertThat(upgradedQuality).named("upgradedQuality")
+                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
+    }
+
+    @Test
+    public void upgradeQuality_dpmRequirement_shouldReturnRequiredQuality() {
+        doReturn(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC)
+                .when(mDevicePolicyManager)
+                .getPasswordQuality(nullable(ComponentName.class), anyInt());
+
+        int upgradedQuality = mController.upgradeQuality(
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+        assertThat(upgradedQuality).named("upgradedQuality")
+                .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
new file mode 100644
index 0000000..5fa731e
--- /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 0000000..b238049
--- /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 0000000..20a05e3
--- /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 0000000..0a0734f
--- /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 71%
rename from tests/robotests/src/com/android/settings/ConfirmCredentialTest.java
rename to tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
index f771a1f..d76968e 100644
--- a/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
@@ -14,14 +14,15 @@
  * limitations under the License
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
-import static com.android.settings.ConfirmDeviceCredentialBaseFragment.LastTryDialog;
 import static com.google.common.truth.Truth.assertThat;
 
-import android.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog;
+
 import android.app.Activity;
-import android.app.Fragment;
 import android.app.FragmentManager;
 
 import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -45,11 +46,14 @@
         FragmentManager fm = Robolectric.buildActivity(Activity.class).get().getFragmentManager();
 
         // Launch only one instance at a time.
-        assertThat(LastTryDialog.show(fm, "title", R.string.yes, R.string.ok, false)).isTrue();
-        assertThat(LastTryDialog.show(fm, "title", R.string.yes, R.string.ok, false)).isFalse();
+        assertThat(LastTryDialog.show(
+                fm, "title", android.R.string.yes, android.R.string.ok, false)).isTrue();
+        assertThat(LastTryDialog.show(
+                fm, "title", android.R.string.yes, android.R.string.ok, false)).isFalse();
 
         // After cancelling, the dialog should be re-shown when asked for.
         LastTryDialog.hide(fm);
-        assertThat(LastTryDialog.show(fm, "title", R.string.yes, R.string.ok, false)).isTrue();
+        assertThat(LastTryDialog.show(
+                fm, "title", android.R.string.yes, android.R.string.ok, false)).isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
new file mode 100644
index 0000000..8beefa8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.password;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.DevicePolicyManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION)
+public class ScreenLockTypeTest {
+
+    @Test
+    public void fromQuality_shouldReturnLockWithAssociatedQuality() {
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC))
+                .isEqualTo(ScreenLockType.PASSWORD);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC))
+                .isEqualTo(ScreenLockType.PASSWORD);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK))
+                .isNull();
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX))
+                .isEqualTo(ScreenLockType.PASSWORD);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_MANAGED))
+                .isEqualTo(ScreenLockType.MANAGED);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC))
+                .isEqualTo(ScreenLockType.PIN);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX))
+                .isEqualTo(ScreenLockType.PIN);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING))
+                .isEqualTo(ScreenLockType.PATTERN);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
+                .isEqualTo(ScreenLockType.SWIPE);
+    }
+
+    @Test
+    public void fromKey_shouldReturnLockWithGivenKey() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(ScreenLockType.fromKey(lock.preferenceKey)).isEqualTo(lock);
+        }
+        assertThat(ScreenLockType.fromKey("nonexistent")).isNull();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
index 573f5d8..cb863a0 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
@@ -16,14 +16,16 @@
 
 package com.android.settings.password;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.Shadows.shadowOf;
+
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
 
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.SetupChooseLockGeneric;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.After;
@@ -35,9 +37,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.robolectric.Shadows.shadowOf;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SetNewPasswordActivityTest {
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
index ab01360..96775ad 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -16,13 +16,32 @@
 
 package com.android.settings.password;
 
+import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
+
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
+        .HIDE_DISABLED_PREFS;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
+        .MINIMUM_QUALITY_KEY;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -33,20 +52,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
-import static com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS;
-import static com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY;
-import static com.android.settings.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
-import static com.android.settings.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
-import static com.android.settings.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 
 /**
  * Tests for {@link SetNewPasswordController}.
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
new file mode 100644
index 0000000..39a0fb6
--- /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 0e2a2f6..cf34f45 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
@@ -22,21 +22,25 @@
 
 import android.app.Activity;
 import android.content.res.Resources;
+import android.print.PrintJob;
+import android.print.PrintJobInfo;
 import android.print.PrintManager;
 import android.printservice.PrintServiceInfo;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -63,13 +67,26 @@
     }
 
     @Test
+    public void testSummary_hasActiveJob_shouldSetSummaryToNumberOfJobs() {
+        final List<PrintJob> printJobs = new ArrayList<>();
+        final PrintJob job = mock(PrintJob.class, Mockito.RETURNS_DEEP_STUBS);
+        printJobs.add(job);
+        when(job.getInfo().getState()).thenReturn(PrintJobInfo.STATE_STARTED);
+        when(mPrintManager.getPrintJobs()).thenReturn(printJobs);
+
+        mSummaryProvider.setListening(true);
+
+        verify(mRes).getQuantityString(R.plurals.print_jobs_summary, 1, 1);
+    }
+
+    @Test
     public void testSummary_shouldSetSummaryToNumberOfPrintServices() {
         final List<PrintServiceInfo> printServices = mock(List.class);
         when(printServices.isEmpty()).thenReturn(false);
         when(printServices.size()).thenReturn(2);
         // 2 services
         when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES))
-            .thenReturn(printServices);
+                .thenReturn(printServices);
 
         mSummaryProvider.setListening(true);
 
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index 42c5301..ff39deb 100644
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -21,7 +21,7 @@
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
 
@@ -60,7 +60,7 @@
 
     @Test
     public void getNonIndexableKeys_noPreferenceController_shouldReturnEmptyList() {
-        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST);
+        assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEmpty();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
new file mode 100644
index 0000000..f7628ca
--- /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 6ffd704..ba2b636 100644
--- a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
+++ b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
@@ -6,11 +6,10 @@
 import com.android.settings.DateTimeSettings;
 import com.android.settings.R;
 import com.android.settings.SecuritySettings;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.codeinspection.CodeInspector;
 import com.android.settings.datausage.DataUsageSummary;
-import com.android.settings.search2.DatabaseIndexingUtils;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
similarity index 88%
rename from tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
rename to tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
index 6844be5..3641368 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.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.os.Build;
 import android.provider.SearchIndexableResource;
 import android.util.ArrayMap;
+
 import com.android.settings.R;
-import com.android.settings.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.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 @@
         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 @@
     @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 @@
         // 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 @@
         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 @@
         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 @@
         // 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 @@
                 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 @@
         // 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 @@
         // 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 @@
         // 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 @@
         // 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 @@
         // 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 @@
         // 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 @@
 
     @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 @@
         // 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 @@
         // 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 @@
         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 @@
 
         DatabaseIndexingManager manager =
                 spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-        doReturn(true).when(manager).isFullIndex(anyString(), anyString());
 
         manager.performIndexing();
 
@@ -712,17 +769,17 @@
     @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 @@
         // 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,7 +844,6 @@
 
         DatabaseIndexingManager manager =
                 spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-        doReturn(true).when(manager).isFullIndex(anyString(), anyString());
 
         manager.performIndexing();
 
@@ -797,6 +852,28 @@
 
     @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() {
         DummyProvider provider = new DummyProvider();
         provider.onCreate();
@@ -810,7 +887,6 @@
 
         DatabaseIndexingManager manager =
                 spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-        doReturn(true).when(manager).isFullIndex(anyString(), anyString());
 
         manager.performIndexing();
 
@@ -896,7 +972,10 @@
         // Payload Type - default is 0
         assertThat(cursor.getInt(19)).isEqualTo(0);
         // Payload
-        assertThat(cursor.getBlob(20)).isNull();
+        byte[] payload = cursor.getBlob(20);
+        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
+                ResultPayload.CREATOR);
+        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
     }
 
     @Test
@@ -977,6 +1056,13 @@
 
     // 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 @@
         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 @@
     }
 
     private void insertSpecialCase(String specialCase, boolean enabled, String key) {
-
         ContentValues values = new ContentValues();
         values.put(IndexDatabaseHelper.IndexColumns.DOCID, specialCase.hashCode());
         values.put(IndexDatabaseHelper.IndexColumns.LOCALE, localeStr);
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
index f4370fc..d44ecff 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
@@ -17,35 +17,27 @@
 
 package com.android.settings.search;
 
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
 
+import android.content.Context;
 import android.util.ArrayMap;
+
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.display.AutoBrightnessPreferenceController;
-import com.android.settings.gestures.DoubleTapPowerPreferenceController;
-import com.android.settings.gestures.DoubleTapScreenPreferenceController;
-import com.android.settings.gestures.DoubleTwistPreferenceController;
-import com.android.settings.gestures.PickupGesturePreferenceController;
-import com.android.settings.gestures.SwipeToNotificationPreferenceController;
-import com.android.settings.search2.DatabaseIndexingUtils;
+import com.android.settings.deviceinfo.SystemUpdatePreferenceController;
 
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.ResultPayload;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import java.util.Map;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DatabaseIndexingUtilsTest {
@@ -57,7 +49,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
+        mContext = RuntimeEnvironment.application;
     }
 
     @Test
@@ -74,11 +66,11 @@
 
     @Test
     public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsValidMap() {
-        String className = "com.android.settings.DisplaySettings";
-
-        Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
-        assertThat(map.get("auto_brightness"))
-                .isInstanceOf(AutoBrightnessPreferenceController.class);
+        final String className = "com.android.settings.system.SystemDashboardFragment";
+        final Map<String, PreferenceController> map =
+                DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
+        assertThat(map.get("system_update_settings"))
+                .isInstanceOf(SystemUpdatePreferenceController.class);
     }
 
     @Test
@@ -103,13 +95,13 @@
 
             @Override
             public ResultPayload getResultPayload() {
-                return new IntentPayload(null);
+                return new ResultPayload(null);
             }
         };
-        ArrayMap<String,PreferenceController> map = new ArrayMap<>();
+        ArrayMap<String, PreferenceController> map = new ArrayMap<>();
         map.put(key, prefController);
 
         ResultPayload payload = DatabaseIndexingUtils.getPayloadFromUriMap(map, key);
-        assertThat(payload).isInstanceOf(IntentPayload.class);
+        assertThat(payload).isInstanceOf(ResultPayload.class);
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
new file mode 100644
index 0000000..90f6e87
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
@@ -0,0 +1,375 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.settings.search;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
+
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SiteMapManager;
+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;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DatabaseResultLoaderTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mMockContext;
+    @Mock
+    private SiteMapManager mSiteMapManager;
+    private Context mContext;
+
+    SQLiteDatabase mDb;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        FakeFeatureFactory.setupForTest(mMockContext);
+        FakeFeatureFactory factory =
+                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
+        when(factory.searchFeatureProvider.getSiteMapManager())
+                .thenReturn(mSiteMapManager);
+        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
+        setUpDb();
+    }
+
+    @After
+    public void cleanUp() {
+        DatabaseTestUtils.clearDb(mContext);
+    }
+
+    @Test
+    public void testMatchTitle() {
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "title", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(2);
+        verify(mSiteMapManager, times(2)).buildBreadCrumb(eq(mContext), anyString(), anyString());
+    }
+
+    @Test
+    public void testMatchSummary() {
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "summary",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(2);
+    }
+
+    @Test
+    public void testMatchKeywords() {
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "keywords",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(2);
+    }
+
+    @Test
+    public void testMatchEntries() {
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "entries",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(2);
+    }
+
+    @Test
+    public void testSpecialCaseWord_matchesNonPrefix() {
+        insertSpecialCase("Data usage");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "usage", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesWordNoDash() {
+        insertSpecialCase("wi-fi calling");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "wifi", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesWordWithDash() {
+        insertSpecialCase("priorités seulment");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "priorités",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesWordWithoutDash() {
+        insertSpecialCase("priorités seulment");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "priorites",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseDash_matchesEntireQueryWithoutDash() {
+        insertSpecialCase("wi-fi calling");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "wifi calling",
+                mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCasePrefix_matchesPrefixOfEntry() {
+        insertSpecialCase("Photos");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "pho", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCasePrefix_DoesNotMatchNonPrefixSubstring() {
+        insertSpecialCase("Photos");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "hot", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(0);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() {
+        insertSpecialCase("Apps Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "Apps", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() {
+        insertSpecialCase("Apps Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "Not", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfFirstEntry() {
+        insertSpecialCase("Apps Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "pp", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(0);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfSecondEntry() {
+        insertSpecialCase("Apps Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "tion", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(0);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() {
+        insertSpecialCase("Apps & Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "App", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry() {
+        insertSpecialCase("Apps & Notifications");
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "No", mSiteMapManager);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testResultMatchedByMultipleQueries_duplicatesRemoved() {
+        String key = "durr";
+        insertSameValueAllFieldsCase(key);
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, key, null);
+
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
+    public void testSpecialCaseTwoWords_multipleResults() {
+        final String caseOne = "Apple pear";
+        final String caseTwo = "Banana apple";
+        insertSpecialCase(caseOne);
+        insertSpecialCase(caseTwo);
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "App", null);
+        Set<? extends SearchResult> results = loader.loadInBackground();
+        Set<CharSequence> expectedTitles = new HashSet<>(Arrays.asList(caseOne, caseTwo));
+        Set<CharSequence> actualTitles = new HashSet<>();
+        for (SearchResult result : results) {
+            actualTitles.add(result.title);
+        }
+        assertThat(actualTitles).isEqualTo(expectedTitles);
+    }
+
+    private void insertSpecialCase(String specialCase) {
+        String normalized = DatabaseIndexingUtils.normalizeHyphen(specialCase);
+        normalized = DatabaseIndexingUtils.normalizeString(normalized);
+        final ResultPayload payload = new ResultPayload(new Intent());
+
+        ContentValues values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, normalized.hashCode());
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, specialCase);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, normalized);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
+                "com.android.settings.gestures.GestureSettings");
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, normalized.hashCode());
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
+
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+    }
+
+    private void setUpDb() {
+        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(new Intent()));
+
+        ContentValues values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "alpha_title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "alpha title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "alpha_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "alpha summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "alpha_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "alpha summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "alpha entries");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "alpha keywords");
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
+                "com.android.settings.gestures.GestureSettings");
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_0");
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
+
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+
+        values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 2);
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "bravo_title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "bravo title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "bravo_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "bravo summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "bravo_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "bravo summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "bravo entries");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "bravo keywords");
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
+                "com.android.settings.gestures.GestureSettings");
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_1");
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+
+        values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 3);
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "charlie_title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "charlie title");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "charlie_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "charlie summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "charlie_summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "charlie summary");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "charlie entries");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "charlie keywords");
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
+                "com.android.settings.gestures.GestureSettings");
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, false);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_2");
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
+
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+    }
+
+    private void insertSameValueAllFieldsCase(String key) {
+        final ResultPayload payload = new ResultPayload(new Intent());
+
+        ContentValues values = new ContentValues();
+        values.put(IndexDatabaseHelper.IndexColumns.DOCID, key.hashCode());
+        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, key);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, key);
+        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME, key);
+        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, key);
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
+        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, key);
+        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
+        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
+        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, key.hashCode());
+        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
+
+        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
index 34626bd..a0d3163 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -10,24 +10,26 @@
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License static for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  *
  */
 
 package com.android.settings.search;
 
+import android.content.ComponentName;
 import android.content.Intent;
-import com.android.settings.SettingsRobolectricTestRunner;
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.DatabaseIndexingManager.DatabaseRow;
-import com.android.settings.search2.DatabaseIndexingManager.DatabaseRow.Builder;
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.ResultPayload;
-import com.android.settings.search2.ResultPayloadUtils;
+import com.android.settings.search.DatabaseIndexingManager.DatabaseRow;
+import com.android.settings.search.DatabaseIndexingManager.DatabaseRow.Builder;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -35,7 +37,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DatabaseRowTest {
-    private Builder builder;
+    private Builder mBuilder;
 
     private static final String LOCALE = "locale";
     private static final String UPDATED_TITLE = "updated title";
@@ -46,7 +48,7 @@
     private static final String NORMALIZED_SUMMARY_OFF = "normalized summary off";
     private static final String ENTRIES = "entries";
     private static final String CLASS_NAME = "class name";
-    private static final String SCREEN_TITLE = "sceen title";
+    private static final String SCREEN_TITLE = "screen title";
     private static final int ICON_RES_ID = 0xff;
     private static final int RANK = 1;
     private static final String SPACE_DELIMITED_KEYWORDS = "keywords";
@@ -56,28 +58,23 @@
     private static final boolean ENABLED = true;
     private static final String KEY = "key";
     private static final int USER_ID = 1;
-    private static IntentPayload intentPayload;
 
-    private final String EXTRA_KEY = "key";
-    private final String EXTRA_VALUE = "value";
+    private Context mContext;
 
     @Before
     public void setUp() {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_KEY, EXTRA_VALUE);
-        intentPayload = new IntentPayload(intent);
-
-        builder = new DatabaseRow.Builder();
+        mContext = RuntimeEnvironment.application;
+        mBuilder = createBuilder();
     }
 
     @Test
-    public void testFullRowBuild_NonNull() {
+    public void testFullRowBuild_nonNull() {
         DatabaseRow row = generateRow();
         assertThat(row).isNotNull();
     }
 
     @Test
-    public void testPrimativesBuild_NoDataLoss() {
+    public void testPrimitivesBuild_noDataLoss() {
         DatabaseRow row = generateRow();
 
         assertThat(row.locale).isEqualTo(LOCALE);
@@ -100,30 +97,61 @@
         assertThat(row.userId).isEqualTo(USER_ID);
         assertThat(row.key).isEqualTo(KEY);
         assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INTENT);
+        assertThat(row.payload).isNotNull();
     }
 
     @Test
-    public void testPayload_PayloadTypeAdded() {
-        DatabaseRow row = generateRow();
-        byte[] marshalledPayload = row.payload;
-        IntentPayload payload = ResultPayloadUtils.unmarshall(marshalledPayload,
-                IntentPayload.CREATOR);
-
-        Intent intent = payload.intent;
-        assertThat(intent.getExtra(EXTRA_KEY)).isEqualTo(EXTRA_VALUE);
+    public void testGenericIntent_addedToPayload() {
+        final DatabaseRow row = generateRow();
+        final ResultPayload payload = ResultPayloadUtils.unmarshall(row.payload,
+                ResultPayload.CREATOR);
+        final ComponentName name = payload.getIntent().getComponent();
+        assertThat(name.getClassName()).isEqualTo(INTENT_TARGET_CLASS);
+        assertThat(name.getPackageName()).isEqualTo(INTENT_TARGET_PACKAGE);
     }
 
     @Test
-    public void TestNullPayload_NoCrash() {
-        Builder builder = new Builder();
-        builder.setPayload(null);
-        DatabaseRow row = builder.build();
+    public void testRowWithInlinePayload_genericPayloadNotAdded() {
+        final String URI = "test uri";
+        final InlineSwitchPayload payload = new InlineSwitchPayload(URI, 0 /* mSettingSource */,
+                1 /* onValue */, null /* intent */, true /* isDeviceSupported */, 1 /* default */);
+        mBuilder.setPayload(payload);
+        final DatabaseRow row = generateRow();
+        final InlineSwitchPayload unmarshalledPayload = ResultPayloadUtils
+                .unmarshall(row.payload, InlineSwitchPayload.CREATOR);
 
-        assertThat(row.payload).isNull();
+        assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INLINE_SWITCH);
+        assertThat(unmarshalledPayload.mSettingKey).isEqualTo(URI);
     }
 
+    @Test
+    public void testRowWithInlinePayload_intentAddedToInlinePayload() {
+        final String URI = "test uri";
+        final ComponentName component = new ComponentName(INTENT_TARGET_PACKAGE,
+                INTENT_TARGET_CLASS);
+        final Intent intent = new Intent();
+        intent.setComponent(component);
+
+        final InlineSwitchPayload payload = new InlineSwitchPayload(URI, 0 /* mSettingSource */,
+                1 /* onValue */, intent, true /* isDeviceSupported */, 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 @@
                 .setIntentTargetClass(INTENT_TARGET_CLASS)
                 .setEnabled(ENABLED)
                 .setKey(KEY)
-                .setUserId(USER_ID)
-                .setPayload(intentPayload);
-
-        return(builder.build());
+                .setUserId(USER_ID);
+        return mBuilder;
     }
-}
-;
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
index 79c0d63..64a658e 100644
--- a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
+++ b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
@@ -16,20 +16,6 @@
 
 package com.android.settings.search;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.only;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
 import android.app.Application;
@@ -54,7 +40,7 @@
 import android.view.inputmethod.InputMethodInfo;
 
 import com.android.internal.content.PackageMonitor;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
@@ -62,7 +48,6 @@
 import com.android.settings.inputmethod.VirtualKeyboardFragment;
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.print.PrintSettingsFragment;
-import com.android.settings.search2.DatabaseIndexingManager;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.shadow.ShadowActivityWithLoadManager;
 import com.android.settings.testutils.shadow.ShadowContextImplWithRegisterReceiver;
@@ -92,6 +77,19 @@
 import java.util.Collections;
 import java.util.List;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.only;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
         manifest = TestConfig.MANIFEST_PATH,
@@ -164,7 +162,7 @@
         DynamicIndexableContentMonitor.resetForTesting();
         mRobolectricPackageManager.reset();
 
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mActivity);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
index 35486ef..69c2589 100644
--- a/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
+++ b/tests/robotests/src/com/android/settings/search/FakeIndexProvider.java
@@ -19,12 +19,12 @@
 
 import android.content.Context;
 import android.provider.SearchIndexableResource;
+
 import com.android.settings.core.PreferenceController;
 
-import java.util.ArrayList;
 import java.util.List;
 
-public class FakeIndexProvider  implements Indexable {
+public class FakeIndexProvider implements Indexable {
 
     public static final String KEY = "TestKey";
 
@@ -38,7 +38,7 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    ArrayList<String> result = new ArrayList<>();
+                    List<String> result = super.getNonIndexableKeys(context);
                     result.add(KEY);
                     return result;
                 }
diff --git a/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
new file mode 100644
index 0000000..bee8d93
--- /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 0000000..1747cca
--- /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 701679c..b067ea6 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.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+import com.android.settings.search.ResultPayload.Availability;
+import com.android.settings.search.ResultPayload.SettingsSource;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class InlineSwitchPayloadTest {
 
-    @Test
-    public void testGetSwitch_EmptyMap_ExceptionThrown() {
-        final String uri = "test.com";
-        final int source = ResultPayload.SettingsSource.SECURE;
+    private static final String DUMMY_SETTING = "inline_test";
+    private static final int STANDARD_ON = 1;
+    private static final int FLIPPED_ON = 0;
 
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, null);
-        try {
-            payload.getSwitchValue(context);
-            fail("Should have thrown exception for null map");
-        } catch (IllegalStateException e) {
-            assertThat(e).isNotNull();
-        }
-    }
+    private Context mContext;
 
-    @Test
-    public void testGetSwitch_BadMap_ExceptionThrown() {
-        final String uri = "test.com";
-        final int source = ResultPayload.SettingsSource.SECURE;
-        final ArrayMap<Integer, Boolean> map = new ArrayMap<>();
-
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
-        InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, map);
-        try {
-            payload.getSwitchValue(context);
-            fail("Should have thrown exception for bad map");
-        } catch (IllegalStateException e) {
-            assertThat(e).isNotNull();
-        }
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
     }
 
     @Test
     public void testConstructor_DataRetained() {
         final String uri = "test.com";
         final int type = ResultPayload.PayloadType.INLINE_SWITCH;
-        final int source = ResultPayload.SettingsSource.SECURE;
-        final ArrayMap<Integer, Boolean> map = new ArrayMap<>();
-        map.put(1, true);
-        map.put(0, false);
+        final int source = SettingsSource.SECURE;
+        final String intentKey = "key";
+        final String intentVal = "value";
+        final Intent intent = new Intent();
+        intent.putExtra(intentKey, intentVal);
 
-        InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, map);
-        assertThat(payload.settingsUri).isEqualTo(uri);
-        assertThat(payload.inlineType).isEqualTo(type);
-        assertThat(payload.settingSource).isEqualTo(source);
-        assertThat(payload.valueMap.get(1)).isTrue();
-        assertThat(payload.valueMap.get(0)).isFalse();
+        InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, 1, intent, true,
+                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 ba9feb3..94ee335 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
@@ -19,17 +19,11 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.util.Pair;
 import android.view.LayoutInflater;
 
-import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.InlineSwitchViewHolder;
-import com.android.settings.search2.SearchFragment;
-import com.android.settings.search2.SearchResult;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -46,8 +40,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -94,7 +86,7 @@
 
     @Test
     public void testBindViewElements_AllUpdated() {
-        when(mPayload.getSwitchValue(any(Context.class))).thenReturn(true);
+        when(mPayload.getValue(any(Context.class))).thenReturn(1);
         SearchResult result = getSearchResult();
         mHolder.onBind(mFragment, result);
         // Precondition: switch is on.
@@ -102,10 +94,6 @@
 
         mHolder.switchView.performClick();
 
-        verify(mFeatureFactory.metricsFeatureProvider).action(
-                any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT),
-                any(Pair.class), any(Pair.class), any(Pair.class));
         assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
         assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
         assertThat(mHolder.iconView.getDrawable()).isEqualTo(mIcon);
@@ -114,13 +102,17 @@
 
     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 78%
rename from tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
index e808946..d0a200d 100644
--- a/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,18 +12,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.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;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.dashboard.SiteMapManager;
@@ -36,17 +39,23 @@
 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;
@@ -162,6 +171,36 @@
     }
 
     @Test
+    public void query_matchingQuery_shouldReturnSystemAppIfHomeApp() {
+        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
+                .thenReturn(Arrays.asList(
+                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
+                                0 /* targetSdkVersion */)));
+        when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
+                any(Intent.class), anyInt(), anyInt()))
+                .thenReturn(null);
+
+        when(mPackageManagerWrapper.getHomeActivities(anyList())).thenAnswer(new Answer<Object>() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                final List<ResolveInfo> list = (List<ResolveInfo>) invocation.getArguments()[0];
+                final ResolveInfo info = new ResolveInfo();
+                info.activityInfo = new ActivityInfo();
+                info.activityInfo.packageName = "app1";
+                list.add(info);
+                return null;
+            }
+        });
+
+        final String query = "app";
+
+        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+                mSiteMapManager);
+
+        assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
+    }
+
+    @Test
     public void query_matchingQuery_shouldNotReturnSystemAppIfNotLaunchable() {
         when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
                 .thenReturn(Arrays.asList(
@@ -182,18 +221,19 @@
     }
 
     @Test
-    public void query_matchingQuery_shouldRankBasedOnSimilarity() {
+    public void query_matchingQuery_multipleResults() {
         final String query = "app";
 
         mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
                 mSiteMapManager);
-        final List<? extends SearchResult> results = mLoader.loadInBackground();
+        final Set<? extends SearchResult> results = mLoader.loadInBackground();
 
-        // List is sorted by rank
-        assertThat(results.get(0).rank).isAtMost(results.get(1).rank);
-        assertThat(results.get(0).title).isEqualTo("app4");
-        assertThat(results.get(1).title).isEqualTo("app");
-        assertThat(results.get(2).title).isEqualTo("appBuffer");
+        Set<CharSequence> expectedTitles = new HashSet<>(Arrays.asList("app4", "app", "appBuffer"));
+        Set<CharSequence> actualTitles = new HashSet<>();
+        for (SearchResult result : results) {
+            actualTitles.add(result.title);
+        }
+        assertThat(actualTitles).isEqualTo(expectedTitles);
     }
 
     @Test
@@ -349,4 +389,41 @@
 
         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 63eec10..53b3ca5 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.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.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.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 @@
         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 @@
 
     @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 @@
         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 @@
     @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 @@
         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 @@
 
     @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 @@
 
     @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 @@
     }
 
     @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 @@
         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 @@
     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 17cda43..c68cbdf 100644
--- a/tests/robotests/src/com/android/settings/search2/MockAppLoader.java
+++ b/tests/robotests/src/com/android/settings/search/MockAppLoader.java
@@ -15,12 +15,14 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
+import com.android.settings.search.InstalledAppResultLoader;
+import com.android.settings.search.SearchResult;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Mock loader to subvert the requirements of returning data while also driving the Loader
@@ -33,12 +35,12 @@
     }
 
     @Override
-    public List<? extends SearchResult> loadInBackground() {
-        return new ArrayList<>();
+    public Set<? extends SearchResult> loadInBackground() {
+        return new HashSet<>();
     }
 
     @Override
-    protected void onDiscardResult(List<? extends SearchResult> result) {
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
 
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search2/MockDBLoader.java b/tests/robotests/src/com/android/settings/search/MockDBLoader.java
similarity index 72%
rename from tests/robotests/src/com/android/settings/search2/MockDBLoader.java
rename to tests/robotests/src/com/android/settings/search/MockDBLoader.java
index 18d8771..b28c1ed 100644
--- a/tests/robotests/src/com/android/settings/search2/MockDBLoader.java
+++ b/tests/robotests/src/com/android/settings/search/MockDBLoader.java
@@ -15,12 +15,14 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.Context;
+import com.android.settings.search.DatabaseResultLoader;
+import com.android.settings.search.SearchResult;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Mock loader to subvert the requirements of returning data while also driving the Loader
@@ -33,12 +35,12 @@
     }
 
     @Override
-    public List<? extends SearchResult> loadInBackground() {
-        return new ArrayList<>();
+    public Set<? extends SearchResult> loadInBackground() {
+        return new HashSet<>();
     }
 
     @Override
-    protected void onDiscardResult(List<? extends SearchResult> result) {
+    protected void onDiscardResult(Set<? extends SearchResult> result) {
 
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/IntentPayloadTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
similarity index 74%
rename from tests/robotests/src/com/android/settings/search/IntentPayloadTest.java
rename to tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
index 6f42622..0bb43c5 100644
--- a/tests/robotests/src/com/android/settings/search/IntentPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 
 import android.content.Intent;
 import android.os.Parcel;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.IntentPayload;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -31,8 +31,8 @@
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class IntentPayloadTest {
-    private IntentPayload mPayload;
+public class ResultPayloadTest {
+    private ResultPayload mPayload;
 
     private final String EXTRA_KEY = "key";
     private final String EXTRA_VALUE = "value";
@@ -43,14 +43,14 @@
         intent.putExtra(EXTRA_KEY, EXTRA_VALUE);
         Parcel parcel = Parcel.obtain();
 
-        mPayload = new IntentPayload(intent);
+        mPayload = new ResultPayload(intent);
         mPayload.writeToParcel(parcel, 0);
         // Reset parcel for reading
         parcel.setDataPosition(0);
-        IntentPayload newPayload = IntentPayload.CREATOR.createFromParcel(parcel);
+        ResultPayload newPayload = ResultPayload.CREATOR.createFromParcel(parcel);
 
-        String originalIntentExtra = mPayload.intent.getStringExtra(EXTRA_KEY);
-        String copiedIntentExtra = newPayload.intent.getStringExtra(EXTRA_KEY);
+        String originalIntentExtra = mPayload.getIntent().getStringExtra(EXTRA_KEY);
+        String copiedIntentExtra = newPayload.getIntent().getStringExtra(EXTRA_KEY);
         assertThat(originalIntentExtra).isEqualTo(copiedIntentExtra);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
index 3875d86..50bdb84 100644
--- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,25 +18,21 @@
 package com.android.settings.search;
 
 import android.content.Intent;
-import android.os.BadParcelableException;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.ResultPayloadUtils;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import java.io.StreamCorruptedException;
-
 import static com.google.common.truth.Truth.assertThat;
 import static junit.framework.Assert.fail;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ResultPayloadUtilsTest {
-    private IntentPayload payload;
+    private ResultPayload payload;
 
     private final String EXTRA_KEY = "key";
     private final String EXTRA_VALUE = "value";
@@ -45,14 +41,14 @@
     public void setUp() {
         Intent intent = new Intent();
         intent.putExtra(EXTRA_KEY, EXTRA_VALUE);
-        payload = new IntentPayload(intent);
+        payload = new ResultPayload(intent);
     }
 
     @Test
     public void testUnmarshallBadData_ExceptionThrown() {
         byte[] badData = "I'm going to fail :)".getBytes();
         try {
-            ResultPayloadUtils.unmarshall(badData, IntentPayload.CREATOR);
+            ResultPayloadUtils.unmarshall(badData, ResultPayload.CREATOR);
             fail("unmarshall should throw exception");
         } catch ( RuntimeException e) {
             assertThat(e).isNotNull();
@@ -60,7 +56,7 @@
     }
 
     @Test
-    public void testMarshallIntentPayload_NonEmptyArray() {
+    public void testMarshallResultPayload_NonEmptyArray() {
         byte[] marshalledPayload = ResultPayloadUtils.marshall(payload);
         assertThat(marshalledPayload).isNotNull();
         assertThat(marshalledPayload).isNotEmpty();
@@ -69,11 +65,11 @@
     @Test
     public void testUnmarshall_PreservedData() {
         byte[] marshalledPayload = ResultPayloadUtils.marshall(payload);
-        IntentPayload newPayload = ResultPayloadUtils.unmarshall(marshalledPayload,
-                IntentPayload.CREATOR);
+        ResultPayload newPayload = ResultPayloadUtils.unmarshall(marshalledPayload,
+                ResultPayload.CREATOR);
 
-        String originalIntentExtra = payload.intent.getStringExtra(EXTRA_KEY);
-        String copiedIntentExtra = newPayload.intent.getStringExtra(EXTRA_KEY);
+        String originalIntentExtra = payload.getIntent().getStringExtra(EXTRA_KEY);
+        String copiedIntentExtra = newPayload.getIntent().getStringExtra(EXTRA_KEY);
         assertThat(originalIntentExtra).isEqualTo(copiedIntentExtra);
     }
 
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
similarity index 92%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
index 5209ed9..780a8a5d 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
@@ -12,18 +12,18 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.testutils.DatabaseTestUtils;
 
 import org.junit.After;
@@ -55,7 +55,7 @@
 
     @After
     public void cleanUp() {
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
index daa6d5e..7421d1a 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
@@ -12,12 +12,13 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
index ae78279..6d49555 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
@@ -12,14 +12,15 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.DatabaseTestUtils;
 
@@ -49,7 +50,7 @@
 
     @After
     public void cleanUp() {
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
similarity index 86%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
index 5777609..691fcf7 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
@@ -12,16 +12,21 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
@@ -32,10 +37,6 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SavedQueryViewHolderTest {
@@ -67,7 +68,7 @@
         mTitleView.performClick();
         mRemoveButton.performClick();
 
-        verify(mSearchFragment).onSavedQueryClicked(any(CharSequence.class));
-        verify(mSearchFragment).onRemoveSavedQueryClicked(any(CharSequence.class));
+        verify(mSearchFragment).onSavedQueryClicked(nullable(CharSequence.class));
+        verify(mSearchFragment).onRemoveSavedQueryClicked(nullable(CharSequence.class));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index e733196..30ffaf8 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -20,10 +20,9 @@
 import android.app.Activity;
 import android.view.Menu;
 
-import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.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.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 @@
     }
 
     @Test
-    public void testPassNull_NoError() {
-        mProvider.setUpSearchMenu(null, null);
-    }
-
-    @Test
-    public void testSetUpMenu_HasItemAdded() {
-        mProvider.setUpSearchMenu(menu, mActivity);
-
-        verify(menu).add(anyInt(), anyInt(), anyInt(), anyString());
-    }
-
-    @Test
     public void getSiteMapManager_shouldCacheInstance() {
         final SiteMapManager manager1 = mProvider.getSiteMapManager();
         final SiteMapManager manager2 = mProvider.getSiteMapManager();
 
         assertThat(manager1).isSameAs(manager2);
     }
+
+    @Test
+    public void getDatabaseSearchLoader_shouldCleanupQuery() {
+        final String query = "  space ";
+        final DatabaseResultLoader loader = mProvider.getDatabaseSearchLoader(mActivity, query);
+
+        assertThat(loader.mQueryText).isEqualTo(query.trim());
+    }
+
+    @Test
+    public void getInstalledAppSearchLoader_shouldCleanupQuery() {
+        final String query = "  space ";
+        final InstalledAppResultLoader loader =
+                mProvider.getInstalledAppSearchLoader(mActivity, query);
+
+        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 2e91ec6..7ee3f97 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.SettingsRobolectricTestRunner;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search.IndexingCallback;
+import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
+import 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.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.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 @@
     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 @@
     }
 
     @Test
-    public void queryTextChange_shouldTriggerLoader() {
+    public void queryTextChange_shouldTriggerLoaderAndInitializeSearch() {
         when(mFeatureFactory.searchFeatureProvider
                 .getDatabaseSearchLoader(any(Context.class), anyString()))
                 .thenReturn(mDatabaseResultLoader);
@@ -156,6 +182,7 @@
         when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
                 .thenReturn(true);
 
+        ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
         fragment.onQueryTextChange(testQuery);
         activityController.get().onBackPressed();
 
@@ -170,10 +197,28 @@
                 .getDatabaseSearchLoader(any(Context.class), anyString());
         verify(mFeatureFactory.searchFeatureProvider)
                 .getInstalledAppSearchLoader(any(Context.class), anyString());
+        verify(mSearchResultsAdapter).initializeSearch(mQueryCaptor.capture());
+        assertThat(mQueryCaptor.getValue()).isEqualTo(testQuery);
     }
 
     @Test
-    public void queryTextChangeToEmpty_shouldLoadSavedQuery() {
+    public void onSearchResultsDisplayed_noResult_shouldShowNoResultView() {
+        ActivityController<SearchActivity> activityController =
+                Robolectric.buildActivity(SearchActivity.class);
+        activityController.setup();
+        SearchFragment fragment = spy((SearchFragment) activityController.get().getFragmentManager()
+                .findFragmentById(R.id.main_content));
+        fragment.onSearchResultsDisplayed(0 /* count */);
+
+        assertThat(fragment.mNoResultsView.getVisibility()).isEqualTo(View.VISIBLE);
+        verify(mFeatureFactory.metricsFeatureProvider).visible(
+                any(Context.class),
+                anyInt(),
+                eq(MetricsProto.MetricsEvent.SETTINGS_SEARCH_NO_RESULT));
+    }
+
+    @Test
+    public void queryTextChangeToEmpty_shouldLoadSavedQueryAndNotInitializeSearch() {
         when(mFeatureFactory.searchFeatureProvider
                 .getDatabaseSearchLoader(any(Context.class), anyString()))
                 .thenReturn(mDatabaseResultLoader);
@@ -190,6 +235,7 @@
         when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
                 .thenReturn(true);
         ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
+        ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
         fragment.mQuery = "123";
 
         fragment.onQueryTextChange("");
@@ -199,6 +245,7 @@
         verify(mFeatureFactory.searchFeatureProvider, never())
                 .getInstalledAppSearchLoader(any(Context.class), anyString());
         verify(mSavedQueryController).loadSavedQueries();
+        verify(mSearchResultsAdapter, never()).initializeSearch(anyString());
     }
 
     @Test
@@ -221,7 +268,7 @@
                 .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 @@
 
         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 @@
     @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 @@
         fragment.onIndexingFinished();
         // no crash
     }
+
+    @Test
+    public void onSearchResultClicked_shouldLogResultMeta() {
+        SearchFragment fragment = new SearchFragment();
+        ReflectionHelpers.setField(fragment, "mMetricsFeatureProvider",
+                mFeatureFactory.metricsFeatureProvider);
+        ReflectionHelpers.setField(fragment, "mSearchFeatureProvider",
+                mFeatureFactory.searchFeatureProvider);
+        ReflectionHelpers.setField(fragment, "mSearchAdapter", mock(SearchResultsAdapter.class));
+        fragment.mSavedQueryController = mock(SavedQueryController.class);
+
+        // Should log result name, result count, clicked rank, etc.
+        final SearchViewHolder resultViewHolder = mock(SearchViewHolder.class);
+        when(resultViewHolder.getClickActionMetricName())
+                .thenReturn(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT);
+        ResultPayload payLoad = new ResultPayload(
+                (new Intent()).putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, "test_setting"));
+        SearchResult searchResult = new SearchResult.Builder()
+                .setStableId(payLoad.hashCode())
+                .setPayload(payLoad)
+                .setTitle("setting_title")
+                .build();
+        fragment.onSearchResultClicked(resultViewHolder, searchResult);
+
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                nullable(Context.class),
+                eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT),
+                eq("test_setting"),
+                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_COUNT)),
+                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK)),
+                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SERACH_QUERY_LENGTH)));
+
+        verify(mFeatureFactory.searchFeatureProvider).searchResultClicked(nullable(Context.class),
+                nullable(String.class), eq(searchResult));
+    }
+
+    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag) {
+        return pair -> pair.first == tag;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index 972bca1..b4a91c5 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -22,7 +22,6 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.codeinspection.CodeInspector;
 import com.android.settings.dashboard.DashboardFragmentSearchIndexProviderInspector;
-import com.android.settings.search2.DatabaseIndexingManager;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -91,7 +90,7 @@
             // If it's a SettingsPreferenceFragment, it must also be Indexable.
             final boolean implementsIndexable = Indexable.class.isAssignableFrom(clazz);
             if (!implementsIndexable) {
-                if (!notImplementingIndexableGrandfatherList.contains(className)) {
+                if (!notImplementingIndexableGrandfatherList.remove(className)) {
                     notImplementingIndexable.add(className);
                 }
                 continue;
@@ -99,7 +98,7 @@
             final boolean hasSearchIndexProvider = hasSearchIndexProvider(clazz);
             // If it implements Indexable, it must also implement the index provider field.
             if (!hasSearchIndexProvider) {
-                if (!notImplementingIndexProviderGrandfatherList.contains(className)) {
+                if (!notImplementingIndexProviderGrandfatherList.remove(className)) {
                     notImplementingIndexProvider.add(className);
                 }
                 continue;
@@ -109,14 +108,14 @@
             final boolean isSharingPrefControllers = DashboardFragmentSearchIndexProviderInspector
                     .isSharingPreferenceControllers(clazz);
             if (!isSharingPrefControllers) {
-                if (!notSharingPrefControllersGrandfatherList.contains(className)) {
+                if (!notSharingPrefControllersGrandfatherList.remove(className)) {
                     notSharingPreferenceControllers.add(className);
                 }
                 continue;
             }
             // Must be in SearchProviderRegistry
             if (SearchIndexableResources.getResourceByName(className) == null) {
-                if (!notInSearchIndexableRegistryGrandfatherList.contains(className)) {
+                if (!notInSearchIndexableRegistryGrandfatherList.remove(className)) {
                     notInSearchProviderRegistry.add(className);
                 }
                 continue;
@@ -145,6 +144,15 @@
         assertWithMessage(notInProviderRegistryError)
                 .that(notInSearchProviderRegistry)
                 .isEmpty();
+        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_indexable",
+                notImplementingIndexableGrandfatherList);
+        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_index_provider",
+                notImplementingIndexProviderGrandfatherList);
+        assertNoObsoleteInGrandfatherList("grandfather_not_in_search_index_provider_registry",
+                notInSearchIndexableRegistryGrandfatherList);
+        assertNoObsoleteInGrandfatherList(
+                "grandfather_not_sharing_pref_controllers_with_search_provider",
+                notSharingPrefControllersGrandfatherList);
     }
 
     private boolean hasSearchIndexProvider(Class clazz) {
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
index 89afcaa..1ddff90 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
@@ -29,7 +29,7 @@
 
 import android.text.TextUtils;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.wifi.WifiSettings;
 
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
index f83b595..e601087 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
@@ -18,15 +18,13 @@
 package com.android.settings.search;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.drawable.Drawable;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.ResultPayload;
-import com.android.settings.search2.SearchResult;
-import com.android.settings.search2.SearchResult.Builder;
+import com.android.settings.search.SearchResult.Builder;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -42,9 +40,10 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SearchResultBuilderTest {
 
+    private static final String TITLE = "title";
+    private static final String SUMMARY = "summary";
+
     private Builder mBuilder;
-    private String mTitle;
-    private String mSummary;
     private ArrayList<String> mBreadcrumbs;
     private int mRank;
     private ResultPayload mResultPayload;
@@ -53,11 +52,9 @@
     @Before
     public void setUp() {
         mBuilder = new Builder();
-        mTitle = "title";
-        mSummary = "summary";
         mBreadcrumbs = new ArrayList<>();
         mRank = 3;
-        mResultPayload = new IntentPayload(null);
+        mResultPayload = new ResultPayload(new Intent());
 
         final Context context = ShadowApplication.getInstance().getApplicationContext();
         mIcon = context.getDrawable(R.drawable.ic_search_history);
@@ -65,77 +62,82 @@
 
     @Test
     public void testAllInfo_BuildSearchResult() {
-        mBuilder.addTitle(mTitle)
-                .addSummary(mSummary)
-                .addRank(mRank)
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(mRank)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addIcon(mIcon)
-                .addPayload(mResultPayload);
+                .setIcon(mIcon)
+                .setPayload(mResultPayload)
+                .setStableId(1);
         SearchResult result = mBuilder.build();
 
         assertThat(result).isNotNull();
-        assertThat(result.title).isEqualTo(mTitle);
-        assertThat(result.summary).isEqualTo(mSummary);
+        assertThat(result.title).isEqualTo(TITLE);
+        assertThat(result.summary).isEqualTo(SUMMARY);
         assertThat(result.rank).isEqualTo(mRank);
         assertThat(result.breadcrumbs).isEqualTo(mBreadcrumbs);
         assertThat(result.icon).isEqualTo(mIcon);
         assertThat(result.payload).isEqualTo(mResultPayload);
     }
 
-    @Test
-    public void testNoTitle_BuildSearchResultException() {
-        mBuilder.addSummary(mSummary)
-                .addRank(mRank)
+    @Test(expected = IllegalStateException.class)
+    public void testNoStableId_BuildSearchResultException() {
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(mRank)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addIcon(mIcon)
-                .addPayload(mResultPayload);
+                .setIcon(mIcon)
+                .setPayload(mResultPayload);
 
-        SearchResult result = null;
-        try {
-            result = mBuilder.build();
-        } catch (IllegalArgumentException e) {
-            // passes.
-        }
-        assertThat(result).isNull();
+        mBuilder.build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testNoTitle_BuildSearchResultException() {
+        mBuilder.setSummary(SUMMARY)
+                .setRank(mRank)
+                .addBreadcrumbs(mBreadcrumbs)
+                .setIcon(mIcon)
+                .setPayload(mResultPayload)
+                .setStableId(1);
+
+        mBuilder.build();
     }
 
     @Test
     public void testNoRank_BuildSearchResult_pass() {
-        mBuilder.addTitle(mTitle)
-                .addSummary(mSummary)
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addIcon(mIcon)
-                .addPayload(mResultPayload);
+                .setIcon(mIcon)
+                .setPayload(mResultPayload)
+                .setStableId(1);
 
         assertThat(mBuilder.build()).isNotNull();
     }
 
     @Test
     public void testNoIcon_BuildSearchResult_pass() {
-        mBuilder.addTitle(mTitle)
-                .addSummary(mSummary)
-                .addRank(mRank)
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(mRank)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addPayload(mResultPayload);
+                .setPayload(mResultPayload)
+                .setStableId(1);
 
         assertThat(mBuilder.build()).isNotNull();
     }
 
-    @Test
+    @Test(expected = IllegalStateException.class)
     public void testNoPayload_BuildSearchResultException() {
-        mBuilder.addTitle(mTitle)
-                .addSummary(mSummary)
-                .addRank(mRank)
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(mRank)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addIcon(mIcon);
+                .setIcon(mIcon)
+                .setStableId(1);
 
-        SearchResult result = null;
-        try {
-            result = mBuilder.build();
-        } catch (IllegalArgumentException e) {
-            // passes.
-        }
-        assertThat(result).isNull();
+        mBuilder.build();
     }
 }
 
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
index 645dfe5..503054b 100644
--- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
@@ -21,37 +21,41 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
+import android.util.Pair;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.AppSearchResult;
-import com.android.settings.search2.DatabaseResultLoader;
-import com.android.settings.search2.InlineSwitchViewHolder;
-import com.android.settings.search2.InstalledAppResultLoader;
-import com.android.settings.search2.IntentPayload;
-import com.android.settings.search2.IntentSearchViewHolder;
-import com.android.settings.search2.ResultPayload;
-import com.android.settings.search2.SearchFragment;
-import com.android.settings.search2.SearchResult;
-import com.android.settings.search2.SearchResult.Builder;
-import com.android.settings.search2.SearchResultsAdapter;
-import com.android.settings.search2.SearchViewHolder;
+import com.android.settings.search.SearchResult.Builder;
+import com.android.settings.search.ranking.SearchResultsRankerCallback;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLooper;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -59,6 +63,13 @@
 
     @Mock
     private SearchFragment mFragment;
+    @Mock
+    private SearchFeatureProvider mSearchFeatureProvider;
+    @Mock
+    private Context mMockContext;
+    @Captor
+    private ArgumentCaptor<Integer> mSearchResultsCountCaptor =
+            ArgumentCaptor.forClass(Integer.class);
     private SearchResultsAdapter mAdapter;
     private Context mContext;
     private String mLoaderClassName;
@@ -69,8 +80,10 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = Robolectric.buildActivity(Activity.class).get();
-        mAdapter = new SearchResultsAdapter(mFragment);
         mLoaderClassName = DatabaseResultLoader.class.getName();
+        when(mFragment.getContext()).thenReturn(mMockContext);
+        when(mMockContext.getApplicationContext()).thenReturn(mContext);
+        mAdapter = new SearchResultsAdapter(mFragment, mSearchFeatureProvider);
     }
 
     @Test
@@ -81,9 +94,10 @@
 
     @Test
     public void testSingleSourceMerge_exactCopyReturned() {
-        ArrayList<SearchResult> intentResults = getIntentSampleResults();
+        Set<SearchResult> intentResults = getIntentSampleResults();
+        mAdapter.initializeSearch("");
         mAdapter.addSearchResults(intentResults, mLoaderClassName);
-        mAdapter.displaySearchResults();
+        mAdapter.notifyResultsLoaded();
 
         List<SearchResult> updatedResults = mAdapter.getSearchResults();
         assertThat(updatedResults).containsAllIn(intentResults);
@@ -98,139 +112,466 @@
     }
 
     @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();
-        // Add subset of items
-        mAdapter.addSearchResults(appResults.subList(0,1),
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(new HashSet<>(appResults),
                 InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(dbResults.subList(0,1), DatabaseResultLoader.class.getName());
-        int count = mAdapter.displaySearchResults();
+        mAdapter.addSearchResults(new HashSet<>(dbResults),
+                DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        // Add subset of items
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(new HashSet<>(appResults.subList(0, 1)),
+                InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(new HashSet<>(dbResults.subList(0, 1)),
+                DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
 
         List<SearchResult> results = mAdapter.getSearchResults();
         assertThat(results.get(0).title).isEqualTo(TITLES[0]);
         assertThat(results.get(1).title).isEqualTo(TITLES[3]);
-        assertThat(count).isEqualTo(2);
+        verify(mFragment, times(2)).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getAllValues().toArray())
+                .isEqualTo(new Integer[] {6, 2});
+    }
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndSucceededAfterResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
+        assertThat(results.get(1).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndSucceededBeforeResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
+        assertThat(results.get(1).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndFailedAfterResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        mAdapter.onRankingFailed();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndFailedBeforeResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.onRankingFailed();
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndTimedoutAfterResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+
+        waitUntilRankingTimesOut();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testEndToEndSearch_smartSearchRankingEnabledAndTimedoutBeforeResultsLoaded() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+
+        waitUntilRankingTimesOut();
+
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+
+        List<SearchResult> results = mAdapter.getSearchResults();
+        assertThat(results.get(0).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(1).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(4).title).isEqualTo(TITLES[5]); // appCharlie
+        assertThat(results.get(5).title).isEqualTo(TITLES[2]); // charlie
+        verify(mFragment).onSearchResultsDisplayed(mSearchResultsCountCaptor.capture());
+        assertThat(mSearchResultsCountCaptor.getValue()).isEqualTo(6);
+    }
+
+    @Test
+    public void testDoSmartRanking_shouldRankAppResultsAfterDbResults() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
+        List<SearchResult> results = mAdapter.doAsyncRanking();
+        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
+        assertThat(results.get(1).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(2).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
+    }
+
+    @Test
+    public void testDoSmartRanking_shouldRankResultsWithMissingScoresAfterScoredResults() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
+        List<Pair<String, Float>> rankingScores = getDummyRankingScores();
+        rankingScores.remove(1); // no ranking score for alpha
+        mAdapter.onRankingScoresAvailable(rankingScores);
+        List<SearchResult> results = mAdapter.doAsyncRanking();
+        assertThat(results.get(0).title).isEqualTo(TITLES[2]); // charlie
+        assertThat(results.get(1).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(results.get(2).title).isEqualTo(TITLES[0]); // alpha
+        assertThat(results.get(3).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(results.get(4).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(results.get(5).title).isEqualTo(TITLES[5]); // appCharlie
+    }
+
+    @Test
+    public void testGetUnsortedLoadedResults () {
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        Set<CharSequence> expectedDbTitles = new HashSet<>(
+                Arrays.asList("alpha", "bravo", "charlie"));
+        Set<CharSequence> expectedAppTitles = new HashSet<>(
+                Arrays.asList("appAlpha", "appBravo", "appCharlie"));
+        Set<CharSequence> actualDbTitles = new HashSet<>();
+        Set<CharSequence> actualAppTitles = new HashSet<>();
+        for (SearchResult result : mAdapter.getUnsortedLoadedResults(SearchResultsAdapter
+                .DB_RESULTS_LOADER_KEY)) {
+            actualDbTitles.add(result.title);
+        }
+        for (SearchResult result : mAdapter.getUnsortedLoadedResults(SearchResultsAdapter
+                .APP_RESULTS_LOADER_KEY)) {
+            actualAppTitles.add(result.title);
+        }
+        assertThat(actualDbTitles).isEqualTo(expectedDbTitles);
+        assertThat(actualAppTitles).isEqualTo(expectedAppTitles);
+    }
+
+    @Test
+    public void testGetSortedLoadedResults() {
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(
+                new HashSet<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(dbResults), DatabaseResultLoader.class.getName());
+        List<? extends SearchResult> actualDbResults =
+                mAdapter.getSortedLoadedResults(SearchResultsAdapter.DB_RESULTS_LOADER_KEY);
+        List<? extends SearchResult> actualAppResults =
+                mAdapter.getSortedLoadedResults(SearchResultsAdapter.APP_RESULTS_LOADER_KEY);
+        assertThat(actualDbResults.get(0).title).isEqualTo(TITLES[0]); // charlie
+        assertThat(actualDbResults.get(1).title).isEqualTo(TITLES[1]); // bravo
+        assertThat(actualDbResults.get(2).title).isEqualTo(TITLES[2]); // alpha
+        assertThat(actualAppResults.get(0).title).isEqualTo(TITLES[3]); // appAlpha
+        assertThat(actualAppResults.get(1).title).isEqualTo(TITLES[4]); // appBravo
+        assertThat(actualAppResults.get(2).title).isEqualTo(TITLES[5]); // appCharlie
+    }
+
+    @Test
+    public void testInitializeSearch_shouldNotRunSmartRankingIfDisabled() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(false);
+        mAdapter.initializeSearch("");
+        mAdapter.notifyResultsLoaded();
+        verify(mSearchFeatureProvider, never()).querySearchResults(
+                any(Context.class), anyString(), any(SearchResultsRankerCallback.class));
+    }
+
+    @Test
+    public void testInitialSearch_shouldRunSmartRankingIfEnabled() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+        mAdapter.initializeSearch("");
+        mAdapter.notifyResultsLoaded();
+        verify(mSearchFeatureProvider, times(1)).querySearchResults(
+                any(Context.class), anyString(), any(SearchResultsRankerCallback.class));
+    }
+
+    @Test
+    public void testGetRankingScoreByStableId() {
+        when(mSearchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(true);
+
+        List<SearchResult> appResults = getDummyAppResults();
+        List<SearchResult> dbResults = getDummyDbResults();
+        mAdapter.initializeSearch("");
+        mAdapter.onRankingScoresAvailable(getDummyRankingScores());
+        assertThat(mAdapter.getRankingScoreByStableId(dbResults.get(0).stableId))
+                .isWithin(1e-10f).of(0.8f);
+        assertThat(mAdapter.getRankingScoreByStableId(dbResults.get(1).stableId))
+                .isWithin(1e-10f).of(0.2f);
+        assertThat(mAdapter.getRankingScoreByStableId(dbResults.get(2).stableId))
+                .isWithin(1e-10f).of(0.9f);
+        assertThat(mAdapter.getRankingScoreByStableId(appResults.get(0).stableId))
+                .isEqualTo(-Float.MAX_VALUE);
+        assertThat(mAdapter.getRankingScoreByStableId(appResults.get(1).stableId))
+                .isEqualTo(-Float.MAX_VALUE);
+        assertThat(mAdapter.getRankingScoreByStableId(appResults.get(2).stableId))
+                .isEqualTo(-Float.MAX_VALUE);
+    }
+
+    private void waitUntilRankingTimesOut() {
+        while (mAdapter.getHandler().hasMessages(mAdapter.MSG_RANKING_TIMED_OUT)) {
+            try {
+                ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                // Do nothing
+            }
+        }
     }
 
     private List<SearchResult> getDummyDbResults() {
         List<SearchResult> results = new ArrayList<>();
-        IntentPayload payload = new IntentPayload(new Intent());
+        ResultPayload payload = new ResultPayload(new Intent());
         SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addPayload(payload);
-
-        builder.addTitle(TITLES[0])
-                .addRank(1);
+        builder.setPayload(payload)
+                .setTitle(TITLES[0])
+                .setRank(1)
+                .setStableId(Objects.hash(TITLES[0], "db"));
         results.add(builder.build());
 
-        builder.addTitle(TITLES[1])
-                .addRank(3);
+        builder.setTitle(TITLES[1])
+                .setRank(3)
+                .setStableId(Objects.hash(TITLES[1], "db"));
         results.add(builder.build());
 
-        builder.addTitle(TITLES[2])
-                .addRank(6);
+        builder.setTitle(TITLES[2])
+                .setRank(6)
+                .setStableId(Objects.hash(TITLES[2], "db"));
         results.add(builder.build());
 
         return results;
     }
 
-    private List<AppSearchResult> getDummyAppResults() {
-        List<AppSearchResult> results = new ArrayList<>();
-        IntentPayload payload = new IntentPayload(new Intent());
+    private List<SearchResult> getDummyAppResults() {
+        List<SearchResult> results = new ArrayList<>();
+        ResultPayload payload = new ResultPayload(new Intent());
         AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.addPayload(payload);
-
-        builder.addTitle(TITLES[3])
-                .addRank(1);
+        builder.setPayload(payload)
+                .setTitle(TITLES[3])
+                .setRank(1)
+                .setStableId(Objects.hash(TITLES[3], "app"));
         results.add(builder.build());
 
-        builder.addTitle(TITLES[4])
-                .addRank(2);
+        builder.setTitle(TITLES[4])
+                .setRank(2)
+                .setStableId(Objects.hash(TITLES[4], "app"));
         results.add(builder.build());
 
-        builder.addTitle(TITLES[5])
-                .addRank(4);
+        builder.setTitle(TITLES[5])
+                .setRank(4)
+                .setStableId(Objects.hash(TITLES[5], "app"));
         results.add(builder.build());
 
         return results;
     }
 
-    private List<SearchResult> getSortedDummyResults() {
-        List<AppSearchResult> appResults = getDummyAppResults();
-        List<SearchResult> dbResults = getDummyDbResults();
-        List<SearchResult> sortedResults = new ArrayList<>(appResults.size() + dbResults.size());
-        sortedResults.add(dbResults.get(0)); // alpha
-        sortedResults.add(appResults.get(0)); // appAlpha
-        sortedResults.add(appResults.get(1)); // appBravo
-        sortedResults.add(dbResults.get(1)); // bravo
-        sortedResults.add(appResults.get(2)); // appCharlie
-        sortedResults.add(dbResults.get(2)); // Charlie
-
-        return sortedResults;
-    }
-
-    private ArrayList<SearchResult> getIntentSampleResults() {
-        ArrayList<SearchResult> sampleResults = new ArrayList<>();
+    private Set<SearchResult> getIntentSampleResults() {
+        Set<SearchResult> sampleResults = new HashSet<>();
         ArrayList<String> breadcrumbs = new ArrayList<>();
         final Drawable icon = mContext.getDrawable(R.drawable.ic_search_history);
-        final ResultPayload payload = new IntentPayload(null);
+        final ResultPayload payload = new ResultPayload(null);
         final SearchResult.Builder builder = new Builder();
-        builder.addTitle("title")
-                .addSummary("summary")
-                .addRank(1)
+        builder.setTitle("title")
+                .setSummary("summary")
+                .setRank(1)
                 .addBreadcrumbs(breadcrumbs)
-                .addIcon(icon)
-                .addPayload(payload);
+                .setIcon(icon)
+                .setPayload(payload)
+                .setStableId(Objects.hash("title", "summary", 1));
         sampleResults.add(builder.build());
 
-        builder.addRank(2);
+        builder.setRank(2)
+                .setStableId(Objects.hash("title", "summary", 2));
         sampleResults.add(builder.build());
 
-        builder.addRank(3);
+        builder.setRank(3)
+                .setStableId(Objects.hash("title", "summary", 3));
         sampleResults.add(builder.build());
         return sampleResults;
     }
-}
\ No newline at end of file
+
+    private List<Pair<String, Float>> getDummyRankingScores() {
+        List<SearchResult> results = getDummyDbResults();
+        List<Pair<String, Float>> scores = new ArrayList<>();
+        scores.add(new Pair<>(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 96%
rename from tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java
rename to tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
index b8ac8fe..b441b66 100644
--- a/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
@@ -12,9 +12,10 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -22,10 +23,9 @@
 import android.os.Bundle;
 
 import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.search.IndexDatabaseHelper.SiteMapColumns;
 import com.android.settings.system.SystemDashboardFragment;
 import com.android.settings.testutils.DatabaseTestUtils;
@@ -79,7 +79,7 @@
 
     @After
     public void cleanUp() {
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
index e35eb10..5d2a977 100644
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
@@ -22,11 +22,10 @@
 import android.util.AttributeSet;
 import android.util.Xml;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.R;
 
-import com.android.settings.search2.XmlParserUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
deleted file mode 100644
index ab55605..0000000
--- a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search2;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.MatrixCursor;
-import android.graphics.drawable.Drawable;
-import android.util.ArrayMap;
-
-import com.android.settings.DisplaySettings;
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.SubSettings;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.gestures.SwipeToNotificationSettings;
-import com.android.settings.search2.ResultPayload.PayloadType;
-
-import com.android.settings.wifi.WifiSettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class CursorToSearchResultConverterTest {
-
-    private static final String ID = "id";
-    private static final String[] TITLES = {"title1", "title2", "title3"};
-    private static final String SUMMARY = "summary";
-    private static final String TARGET_PACKAGE = "a.b.c";
-    private static final String TARGET_CLASS = "a.b.c.class";
-    private static final String QUERY = "query";
-    private static final Intent INTENT = new Intent("com.android.settings");
-    private static final int ICON = R.drawable.ic_search_history;
-    private static final int BASE_RANK = 1;
-    private static final int EXAMPLES = 3;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SiteMapManager mSiteMapManager;
-    private Drawable mDrawable;
-    private CursorToSearchResultConverter mConverter;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        Context context = Robolectric.buildActivity(Activity.class).get();
-        mDrawable = context.getDrawable(ICON);
-        mConverter = new CursorToSearchResultConverter(context, QUERY);
-    }
-
-    @Test
-    public void testParseNullResults_ReturnsNull() {
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, null, BASE_RANK);
-        assertThat(results).isNull();
-    }
-
-    @Test
-    public void testParseCursor_NotNull() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        assertThat(results).isNotNull();
-    }
-
-    @Test
-    public void testParseCursor_MatchesRank() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            assertThat(results.get(i).rank).isEqualTo(BASE_RANK);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesTitle() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            assertThat(results.get(i).title).isEqualTo(TITLES[i]);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesSummary() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            assertThat(results.get(i).summary).isEqualTo(SUMMARY);
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesIcon() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            Drawable resultDrawable = results.get(i).icon;
-            assertThat(resultDrawable).isNotNull();
-            assertThat(resultDrawable.toString()).isEqualTo(mDrawable.toString());
-        }
-    }
-
-    @Test
-    public void testParseCursor_NoIcon() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(false /* hasIcon */), BASE_RANK);
-        for (int i = 0; i < EXAMPLES; i++) {
-            Drawable resultDrawable = results.get(i).icon;
-            assertThat(resultDrawable).isNull();
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesPayloadType() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        ResultPayload payload;
-        for (int i = 0; i < EXAMPLES; i++) {
-            payload = results.get(i).payload;
-            assertThat(payload.getType()).isEqualTo(PayloadType.INTENT);
-        }
-    }
-
-    @Test
-    public void testLongTitle_PenalizedInRank() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                "Longer than 20 characters", // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                DisplaySettings.class.getName(),
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                BLANK,   // Key
-                0,       // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-        assertThat(results.get(0).rank).isEqualTo(BASE_RANK + 2);
-    }
-
-    @Test
-    public void testParseCursor_MatchesIntentForSubSettings() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                SwipeToNotificationSettings.class.getName(),
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                BLANK,   // Key
-                0,       // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-        IntentPayload payload = (IntentPayload) results.get(0).payload;
-        Intent intent = payload.intent;
-        assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
-    }
-
-    @Test
-    public void testParseCursor_MatchesIntentPayload() {
-        List<SearchResult> results = mConverter.convertCursor(
-                mSiteMapManager, getDummyCursor(), BASE_RANK);
-        IntentPayload payload;
-        for (int i = 0; i < EXAMPLES; i++) {
-            payload = (IntentPayload) results.get(i).payload;
-            Intent intent = payload.intent;
-            assertThat(intent.getAction()).isEqualTo(INTENT.getAction());
-        }
-    }
-
-    @Test
-    public void testParseCursor_MatchesIntentPayloadForExternalApps() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                null,    // class
-                TITLES[0], // Title
-                null,    // icon
-                Intent.ACTION_VIEW,   // action
-                TARGET_PACKAGE,    // target package
-                TARGET_CLASS,   // target class
-                QUERY,   // Key
-                PayloadType.INTENT,    // Payload Type
-                null // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-        IntentPayload payload = (IntentPayload) results.get(0).payload;
-        Intent intent = payload.intent;
-
-        assertThat(intent.getComponent().getPackageName()).isEqualTo(TARGET_PACKAGE);
-        assertThat(intent.getComponent().getClassName()).isEqualTo(TARGET_CLASS);
-    }
-
-    @Test
-    public void testParseCursor_MatchesInlineSwitchPayload() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String uri = "test.com";
-        final int type = ResultPayload.PayloadType.INLINE_SWITCH;
-        final int source = ResultPayload.SettingsSource.SECURE;
-        final ArrayMap<Integer, Boolean> map = new ArrayMap<>();
-        map.put(1, true);
-        map.put(0, false);
-        final InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, map);
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                SwipeToNotificationSettings.class.getName(),
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                BLANK,   // Key
-                type,    // Payload Type
-                ResultPayloadUtils.marshall(payload) // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-        InlineSwitchPayload newPayload = (InlineSwitchPayload) results.get(0).payload;
-
-        assertThat(newPayload.settingsUri).isEqualTo(uri);
-        assertThat(newPayload.inlineType).isEqualTo(type);
-        assertThat(newPayload.settingSource).isEqualTo(source);
-        assertThat(newPayload.valueMap.get(1)).isTrue();
-        assertThat(newPayload.valueMap.get(0)).isFalse();
-    }
-
-    // The following tests are temporary, and should be removed when we replace the Search
-    // White-list solution for elevating ranking.
-
-    @Test
-    public void testWifiKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "main_toggle_wifi";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testBluetoothKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "main_toggle_bluetooth";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testAirplaneKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "toggle_airplane";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testHotspotKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "tether_settings";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testBatterySaverKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "battery_saver";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testNFCKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "toggle_nfc";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testDataSaverKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "restrict_background";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testDataUsageKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "data_usage_enable";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    @Test
-    public void testRoamingKey_PrioritizedResult() {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-        final String key = "button_roaming_key";
-
-        cursor.addRow(new Object[]{
-                ID,      // Doc ID
-                TITLES[0], // Title
-                SUMMARY, // Summary on
-                SUMMARY, // summary off
-                WifiSettings.class.getName(),   // ClassName
-                BLANK,   // screen title
-                null,    // icon
-                BLANK,   // action
-                null,    // target package
-                BLANK,   // target class
-                key,     // Key
-                0,   // Payload Type
-                null     // Payload
-        });
-        List<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
-
-        assertThat(results.get(0).rank).isEqualTo(SearchResult.TOP_RANK);
-    }
-
-    // End of temporary tests
-
-    private MatrixCursor getDummyCursor() {
-        return getDummyCursor(true /* hasIcon */);
-    }
-
-    private MatrixCursor getDummyCursor(boolean hasIcon) {
-        MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
-        final String BLANK = "";
-
-        for (int i = 0; i < EXAMPLES; i++) {
-            ArrayList<String> item = new ArrayList<>(DatabaseResultLoader.SELECT_COLUMNS.length);
-            item.add(ID + i); // Doc ID
-            item.add(TITLES[i]); // Title
-            item.add(SUMMARY); // Summary on
-            item.add(BLANK); // summary off
-            item.add(BLANK); // classname
-            item.add(BLANK); // screen title
-            item.add(hasIcon ? Integer.toString(ICON) : null); // Icon
-            item.add(INTENT.getAction()); // Intent action
-            item.add(BLANK); // target package
-            item.add(BLANK); // target class
-            item.add(BLANK); // Key
-            item.add(Integer.toString(0));     // Payload Type
-            item.add(null); // Payload
-
-            cursor.addRow(item);
-        }
-        return cursor;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
deleted file mode 100644
index 862db32..0000000
--- a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search2;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexDatabaseHelper;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class DatabaseResultLoaderTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mMockContext;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-    private Context mContext;
-    private DatabaseResultLoader loader;
-
-    private final String titleOne = "titleOne";
-    private final String titleTwo = "titleTwo";
-    private final String titleThree = "titleThree";
-    private final String titleFour = "titleFour";
-    private final String summaryOne = "summaryOne";
-    private final String summaryTwo = "summaryTwo";
-    private final String summaryThree = "summaryThree";
-
-    SQLiteDatabase mDb;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        FakeFeatureFactory.setupForTest(mMockContext);
-        FakeFeatureFactory factory =
-                (FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
-        when(factory.searchFeatureProvider.getSiteMapManager())
-                .thenReturn(mSiteMapManager);
-        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
-        setUpDb();
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb();
-    }
-
-    @Test
-    public void testMatchTitle() {
-        loader = new DatabaseResultLoader(mContext, "title", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-        verify(mSiteMapManager, times(2)).buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void testMatchSummary() {
-        loader = new DatabaseResultLoader(mContext, "summary", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testMatchKeywords() {
-        loader = new DatabaseResultLoader(mContext, "keywords", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testMatchEntries() {
-        loader = new DatabaseResultLoader(mContext, "entries", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testSpecialCaseWord_matchesNonPrefix() {
-        insertSpecialCase("Data usage");
-        loader = new DatabaseResultLoader(mContext, "usage", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseSpace_matches() {
-        insertSpecialCase("space");
-        loader = new DatabaseResultLoader(mContext, " space ", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordNoDash() {
-        insertSpecialCase("wi-fi calling");
-        loader = new DatabaseResultLoader(mContext, "wifi", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordWithDash() {
-        insertSpecialCase("priorités seulment");
-        loader = new DatabaseResultLoader(mContext, "priorités", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordWithoutDash() {
-        insertSpecialCase("priorités seulment");
-        loader = new DatabaseResultLoader(mContext, "priorites", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesEntireQueryWithoutDash() {
-        insertSpecialCase("wi-fi calling");
-        loader = new DatabaseResultLoader(mContext, "wifi calling", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCasePrefix_matchesPrefixOfEntry() {
-        insertSpecialCase("Photos");
-        loader = new DatabaseResultLoader(mContext, "pho", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCasePrefix_DoesNotMatchNonPrefixSubstring() {
-        insertSpecialCase("Photos");
-        loader = new DatabaseResultLoader(mContext, "hot", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() {
-        insertSpecialCase("Apps Notifications");
-        loader = new DatabaseResultLoader(mContext, "Apps", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() {
-        insertSpecialCase("Apps Notifications");
-        loader = new DatabaseResultLoader(mContext, "Not", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfFirstEntry() {
-        insertSpecialCase("Apps Notifications");
-        loader = new DatabaseResultLoader(mContext, "pp", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfSecondEntry() {
-        insertSpecialCase("Apps Notifications");
-        loader = new DatabaseResultLoader(mContext, "tion", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() {
-        insertSpecialCase("Apps & Notifications");
-        loader = new DatabaseResultLoader(mContext, "App", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry() {
-        insertSpecialCase("Apps & Notifications");
-        loader = new DatabaseResultLoader(mContext, "No", mSiteMapManager);
-        assertThat(loader.loadInBackground().size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testDeDupe_noDuplicates_originalListReturn() {
-        // Three elements with unique titles and summaries
-        List<SearchResult> results = new ArrayList();
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        builder.addTitle(titleTwo)
-                .addSummary(summaryTwo);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        builder.addTitle(titleThree)
-                .addSummary(summaryThree);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(3);
-        assertThat(results.get(0)).isEqualTo(resultOne);
-        assertThat(results.get(1)).isEqualTo(resultTwo);
-        assertThat(results.get(2)).isEqualTo(resultThree);
-    }
-
-    @Test
-    public void testDeDupe_oneDuplicate_duplicateRemoved() {
-        List<SearchResult> results = new ArrayList();
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addRank(0)
-                .addPayload(intentPayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        // Duplicate of the first element
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addRank(1);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        // Unique
-        builder.addTitle(titleThree)
-                .addSummary(summaryThree);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(2);
-        assertThat(results.get(0)).isEqualTo(resultOne);
-        assertThat(results.get(1)).isEqualTo(resultThree);
-    }
-
-    @Test
-    public void testDeDupe_firstDupeInline_secondDuplicateRemoved() {
-        List<SearchResult> results = new ArrayList();
-        InlineSwitchPayload inlinePayload = new InlineSwitchPayload("", 0,
-                null);
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        // Inline result
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addRank(0)
-                .addPayload(inlinePayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        // Duplicate of first result, but Intent Result. Should be removed.
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addRank(1)
-                .addPayload(intentPayload);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        // Unique
-        builder.addTitle(titleThree)
-                .addSummary(summaryThree);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(2);
-        assertThat(results.get(0)).isEqualTo(resultOne);
-        assertThat(results.get(1)).isEqualTo(resultThree);
-    }
-
-    @Test
-    public void testDeDupe_secondDupeInline_firstDuplicateRemoved() {
-        /*
-         * Create a list as follows:
-         * (5) Intent Four
-         * (4) Inline Two
-         * (3) Intent Three
-         * (2) Intent Two
-         * (1) Intent One
-         *
-         * After removing duplicates:
-         * (4) Intent Four
-         * (3) Inline Two
-         * (2) Intent Three
-         * (1) Intent One
-         */
-        List<SearchResult> results = new ArrayList();
-        InlineSwitchPayload inlinePayload = new InlineSwitchPayload("", 0,
-                null);
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        // Intent One
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        // Intent Two
-        builder.addTitle(titleTwo)
-                .addSummary(summaryTwo)
-                .addPayload(intentPayload);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        // Intent Three
-        builder.addTitle(titleThree)
-                .addSummary(summaryThree);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        // Inline Two
-        builder.addTitle(titleTwo)
-                .addSummary(summaryTwo)
-                .addPayload(inlinePayload);
-        SearchResult resultFour = builder.build();
-        results.add(resultFour);
-
-        // Intent Four
-        builder.addTitle(titleFour)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultFive = builder.build();
-        results.add(resultFive);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(4);
-        assertThat(results.get(0)).isEqualTo(resultOne);
-        assertThat(results.get(1)).isEqualTo(resultThree);
-        assertThat(results.get(2)).isEqualTo(resultFour);
-        assertThat(results.get(3)).isEqualTo(resultFive);
-    }
-
-    @Test
-    public void testDeDupe_threeDuplicates_onlyOneStays() {
-        /*
-         * Create a list as follows:
-         * (3) Intent One
-         * (2) Intent One
-         * (1) Intent One
-         *
-         * After removing duplicates:
-         * (1) Intent One
-         */
-        List<SearchResult> results = new ArrayList();
-        IntentPayload intentPayload = new IntentPayload(new Intent());
-
-        SearchResult.Builder builder = new SearchResult.Builder();
-        // Intent One
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultOne = builder.build();
-        results.add(resultOne);
-
-        // Intent Two
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultTwo = builder.build();
-        results.add(resultTwo);
-
-        // Intent Three
-        builder.addTitle(titleOne)
-                .addSummary(summaryOne)
-                .addPayload(intentPayload);
-        SearchResult resultThree = builder.build();
-        results.add(resultThree);
-
-        loader = new DatabaseResultLoader(mContext, "", null);
-        loader.removeDuplicates(results);
-        assertThat(results.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void testSpecialCaseTwoWords_firstWordMatches_ranksHigher() {
-        final String caseOne = "Apple pear";
-        final String caseTwo = "Banana apple";
-        insertSpecialCase(caseOne);
-        insertSpecialCase(caseTwo);
-        loader = new DatabaseResultLoader(mContext, "App", null);
-        List<? extends SearchResult> results = loader.loadInBackground();
-
-        assertThat(results.get(0).title).isEqualTo(caseOne);
-        assertThat(results.get(1).title).isEqualTo(caseTwo);
-        assertThat(results.get(0).rank).isLessThan(results.get(1).rank);
-    }
-
-    private void insertSpecialCase(String specialCase) {
-        String normalized = DatabaseIndexingUtils.normalizeHyphen(specialCase);
-        normalized = DatabaseIndexingUtils.normalizeString(normalized);
-
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, normalized.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, specialCase);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, normalized);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-
-    private void setUpDb() {
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "alpha_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "alpha title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "alpha_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "alpha summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "alpha_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "alpha summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "alpha entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "alpha keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
-        values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "bravo_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "bravo title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "bravo_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "bravo summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "bravo_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "bravo summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "bravo entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "bravo keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
-        values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 2);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "charlie_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "charlie title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "charlie_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "charlie summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "charlie_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "charlie summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "charlie entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "charlie keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, false);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
new file mode 100644
index 0000000..1a37dec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.security;
+
+
+import android.content.DialogInterface;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.FragmentController;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConfigureKeyGuardDialogTest {
+
+    @Test
+    @Config(shadows = ShadowEventLogWriter.class)
+    public void displayDialog_clickPositiveButton_launchSetNewPassword() {
+        final FragmentController<ConfigureKeyGuardDialog> fragmentController =
+                Robolectric.buildFragment(ConfigureKeyGuardDialog.class);
+        final ConfigureKeyGuardDialog fragment = spy(fragmentController.get());
+        doNothing().when(fragment).startPasswordSetup();
+        fragmentController.attach().create().start().resume();
+        fragment.onClick(null /* dialog */, DialogInterface.BUTTON_POSITIVE);
+        fragment.onDismiss(null /* dialog */);
+
+        verify(fragment).startPasswordSetup();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index c6a0e53..b6487f1 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.security;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 
diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
index d81768a..8406d90 100644
--- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
@@ -23,8 +23,7 @@
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.OwnerInfoSettings;
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreference;
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
index 9cc33a3..8c5e8e5 100644
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
@@ -27,7 +27,7 @@
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Pair;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.R;
 import com.android.settings.TestConfig;
 import com.android.settingslib.drawer.DashboardCategory;
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index ad035bd..77ed4b0 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 android.annotation.StringRes;
 import android.content.Context;
+
 import com.android.settings.R;
-import com.android.settings.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.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);
-  }
+    private static final String CATEGORY_FIRST_IMPRESSION =
+            "com.android.settings.suggested.category.FIRST_IMPRESSION";
 
-  @Test
-  public void wallpaperSuggestion_isValid() {
-    assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
-        R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
-  }
+    private static final String CATEGORY_SETTINGS_ONLY =
+            "com.android.settings.suggested.category.SETTINGS_ONLY";
 
-  @Test
-  public void fingerprintSuggestion_isValid() {
-    assertSuggestionEquals("com.android.settings.Settings$FingerprintSuggestionActivity",
-        R.string.suggestion_additional_fingerprints,
-        R.string.suggestion_additional_fingerprints_summary);
-  }
-
-  @Test
-  public void wifiCallingSuggestion_isValid() {
-    assertSuggestionEquals("Settings$WifiCallingSuggestionActivity",
-        R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
-  }
-
-  private void assertSuggestionEquals(String activityName, @StringRes int title,
-      @StringRes int summary) {
-    final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
-    final ActivityData activityData = androidManifest.getActivityData(activityName);
-    final Map<String, Object> metaData = activityData.getMetaData().getValueMap();
-    final Context context = RuntimeEnvironment.application;
-    final String expectedTitle = context.getString(title);
-    final String expectedSummary = context.getString(summary);
-
-    final String pName= context.getPackageName();
-    final String actualTitle = context.getString(context.getResources().getIdentifier(
-        ((String) metaData.get("com.android.settings.title")).substring(8), "string", pName));
-    final String actualSummary = context.getString(context.getResources().getIdentifier(
-        ((String) metaData.get("com.android.settings.summary")).substring(8), "string", pName));
-    assertThat(actualTitle).isEqualTo(expectedTitle);
-    assertThat(actualSummary).isEqualTo(expectedSummary);
-
-    final List<IntentFilterData> intentFilters = activityData.getIntentFilters();
-    final List<String> categories = new ArrayList<>();
-    for (IntentFilterData intentFilter : intentFilters) {
-      categories.addAll(intentFilter.getCategories());
+    @Test
+    public void wallpaperSuggestion_isValid() {
+        assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
+                CATEGORY_FIRST_IMPRESSION,
+                R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
     }
 
-    assertThat(categories).contains("com.android.settings.suggested.category.SETTINGS_ONLY");
-  }
+    @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);
+    }
+
+    private void assertSuggestionEquals(String activityName, String category, @StringRes int title,
+            @StringRes int summary) {
+        final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
+        final ActivityData activityData = androidManifest.getActivityData(activityName);
+        final Map<String, Object> metaData = activityData.getMetaData().getValueMap();
+        final Context context = RuntimeEnvironment.application;
+        final String expectedTitle = context.getString(title);
+        final String expectedSummary = context.getString(summary);
+
+        final String pName = context.getPackageName();
+        final String actualTitle = context.getString(context.getResources().getIdentifier(
+                ((String) metaData.get("com.android.settings.title")).substring(8), "string",
+                pName));
+        final String actualSummary = context.getString(context.getResources().getIdentifier(
+                ((String) metaData.get("com.android.settings.summary")).substring(8), "string",
+                pName));
+        assertThat(actualTitle).isEqualTo(expectedTitle);
+        assertThat(actualSummary).isEqualTo(expectedSummary);
+
+        final List<IntentFilterData> intentFilters = activityData.getIntentFilters();
+        final List<String> categories = new ArrayList<>();
+        for (IntentFilterData intentFilter : intentFilters) {
+            categories.addAll(intentFilter.getCategories());
+        }
+
+        assertThat(categories).contains(category);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
new file mode 100644
index 0000000..75551e5
--- /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/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
index 7c1d587..28b0a9d 100644
--- a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
@@ -17,7 +17,7 @@
 package com.android.settings.support;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
new file mode 100644
index 0000000..2c59ba7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.support;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.search.SearchIndexableRaw;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SupportDashboardActivityTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void shouldIndexSearchActivityForSearch() {
+        final List<SearchIndexableRaw> indexables =
+                SupportDashboardActivity.SEARCH_INDEX_DATA_PROVIDER
+                        .getRawDataToIndex(mContext, true /* enabled */);
+
+        assertThat(indexables).hasSize(1);
+
+        final SearchIndexableRaw value = indexables.get(0);
+
+        assertThat(value.title).isEqualTo(mContext.getString(R.string.page_tab_title_support));
+        assertThat(value.screenTitle).isEqualTo(mContext.getString(R.string.settings_label));
+        assertThat(value.intentTargetPackage).isEqualTo(mContext.getPackageName());
+        assertThat(value.intentTargetClass).isEqualTo(SupportDashboardActivity.class.getName());
+        assertThat(value.intentAction).isEqualTo(Intent.ACTION_MAIN);
+    }
+
+    @Test
+    public void shouldHandleIntentAction() {
+        RuntimeEnvironment.getRobolectricPackageManager().setQueryIntentImplicitly(true);
+        // Intent action used by setup wizard to start support settings
+        Intent intent = new Intent("com.android.settings.action.SUPPORT_SETTINGS");
+        ResolveInfo resolveInfo = RuntimeEnvironment.getPackageManager().resolveActivity(
+                intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
+        assertThat(resolveInfo).isNotNull();
+        assertThat(resolveInfo.activityInfo.targetActivity)
+                .isEqualTo(SupportDashboardActivity.class.getName());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
index 8f0484d..8cc05e0 100644
--- a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java
@@ -12,7 +12,7 @@
 import android.widget.CheckBox;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.SupportFeatureProvider;
diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
index 73fe09e..116b63c 100644
--- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
+++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
@@ -14,7 +14,7 @@
 import android.content.Context;
 import android.content.IntentFilter;
 import android.support.v4.content.LocalBroadcastManager;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.overlay.SurveyFeatureProvider;
diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index bf0005c..7310ae0 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -22,9 +22,8 @@
 import android.accounts.AccountManager;
 import android.content.Context;
 import android.os.UserManager;
-import android.provider.Settings;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 import com.android.settings.testutils.shadow.ShadowUtils;
@@ -76,21 +75,16 @@
     @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/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index 483dee7..19f8ee2 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowUserManager;
diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
new file mode 100644
index 0000000..2bdab27
--- /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 8fbe1c9..7472996 100644
--- a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
@@ -16,13 +16,18 @@
 
 package com.android.settings.testutils;
 
+import android.content.Context;
+
 import com.android.settings.search.IndexDatabaseHelper;
 
 import java.lang.reflect.Field;
 
 public class DatabaseTestUtils {
 
-    public static void clearDb() {
+    public static void clearDb(Context context) {
+        IndexDatabaseHelper helper = IndexDatabaseHelper.getInstance(context);
+        helper.close();
+
         Field instance;
         Class clazz = IndexDatabaseHelper.class;
         try {
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 68333e7..8be2496 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.bluetooth.BluetoothFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
@@ -28,7 +29,7 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SupportFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.search2.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.overlay.SurveyFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
 
@@ -55,13 +56,14 @@
     public final SuggestionFeatureProvider suggestionsFeatureProvider;
     public final UserFeatureProvider userFeatureProvider;
     public final AssistGestureFeatureProvider assistGestureFeatureProvider;
+    public final BluetoothFeatureProvider bluetoothFeatureProvider;
 
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
      *
      * @param context The context must be a deep mock.
      */
-    public static void setupForTest(Context context) {
+    public static FakeFeatureFactory setupForTest(Context context) {
         sFactory = null;
         when(context.getString(com.android.settings.R.string.config_featureFactory))
                 .thenReturn(FakeFeatureFactory.class.getName());
@@ -71,6 +73,7 @@
         } catch (ClassNotFoundException e) {
             // Ignore.
         }
+        return (FakeFeatureFactory) FakeFeatureFactory.getFactory(context);
     }
 
     /**
@@ -90,6 +93,7 @@
         suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class);
         userFeatureProvider = mock(UserFeatureProvider.class);
         assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
+        bluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
     }
 
     @Override
@@ -153,6 +157,11 @@
     }
 
     @Override
+    public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
+        return bluetoothFeatureProvider;
+    }
+
+    @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         return assistGestureFeatureProvider;
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java
new file mode 100644
index 0000000..2305edb
--- /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/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
similarity index 70%
rename from tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
rename to tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
index a991e7a..91bfff2 100644
--- a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings;
+package com.android.settings.testutils;
 
 import android.app.Fragment;
 import android.content.Intent;
@@ -32,6 +32,8 @@
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
 import static org.robolectric.Robolectric.getShadowsAdapter;
 
+import com.android.settings.SettingsActivity;
+
 /**
  * Custom test runner for the testing of BluetoothPairingDialogs. This is needed because the
  * default behavior for robolectric is just to grab the resource directory in the target package.
@@ -65,34 +67,7 @@
             @Override
             public List<ResourcePath> getIncludedResourcePaths() {
                 List<ResourcePath> paths = super.getIncludedResourcePaths();
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./packages/apps/Settings/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/base/core/res/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/opt/setupwizard/library/eclair-mr1/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/opt/setupwizard/library/full-support/res"),
-                        null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
-                        null));
+                SettingsRobolectricTestRunner.getIncludedResourcePaths(getPackageName(), paths);
                 return paths;
             }
         };
@@ -102,6 +77,41 @@
         return manifest;
     }
 
+    public static void getIncludedResourcePaths(String packageName, List<ResourcePath> paths) {
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./packages/apps/Settings/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/base/core/res/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/opt/setupwizard/library/gingerbread/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/opt/setupwizard/library/recyclerview/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
+                null));
+        paths.add(new ResourcePath(
+                packageName,
+                Fs.fileFromPath("./frameworks/support/v7/cardview/res"),
+                null));
+    }
+
     // A simple utility class to start a Settings fragment with an intent. The code here is almost
     // the same as FragmentTestUtil.startFragment except that it starts an activity with an intent.
     public static void startSettingsFragment(
diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
index f9d5439..4f560022 100644
--- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
@@ -7,7 +7,7 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Xml;
-import com.android.settings.search2.XmlParserUtils;
+import com.android.settings.search.XmlParserUtils;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java
new file mode 100644
index 0000000..00aa9ec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.bluetooth.BluetoothDevice;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import org.robolectric.shadows.ShadowBluetoothDevice;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(BluetoothDevice.class)
+public class SettingsShadowBluetoothDevice {
+    private String mAddress;
+
+    public void __constructor__(String address) {
+        mAddress = address;
+    }
+
+    @Implementation
+    public String getAddress() {
+        return mAddress;
+    }
+
+    @Implementation
+    public int hashCode() {
+        return mAddress.hashCode();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index cb02d3e..c56438f 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.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;
@@ -88,6 +89,15 @@
     }
 
     @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 {
         // The drawable item in switchbar_background.xml refers to a very recent color attribute
@@ -137,6 +147,16 @@
                 realResources, Resources.class, "getInteger", ClassParameter.from(int.class, id));
     }
 
+    @Implementation
+    public boolean getBoolean(int id) {
+        final Object override = sResourceOverrides.get(id);
+        if (override instanceof Boolean) {
+            return (boolean) override;
+        }
+        return Shadow.directlyOn(realResources, Resources.class, "getBoolean",
+                ClassParameter.from(int.class, id));
+    }
+
     @Implements(Theme.class)
     public static class SettingsShadowTheme extends ShadowTheme {
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
new file mode 100644
index 0000000..7e21f12
--- /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 0000000..95d5de5
--- /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 0000000..a6cb5d0
--- /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 36f170a..2e346a2 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 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 @@
                 .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 0000000..34908ca
--- /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 0000000..c5fc601
--- /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 724b9c0..f824297 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
@@ -19,7 +19,7 @@
 
 import android.content.Context;
 import android.content.pm.ResolveInfo;
-import com.android.settings.search2.DatabaseIndexingUtils;
+import com.android.settings.search.DatabaseIndexingUtils;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java
new file mode 100644
index 0000000..2f37ec8
--- /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 0000000..4ec48d3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.view.View;
+
+import com.android.settings.widget.EntityHeaderController;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+
+@Implements(value = EntityHeaderController.class, callThroughByDefault = false)
+public class ShadowEntityHeaderController {
+
+    private static EntityHeaderController sMockController;
+
+    public static void setUseMock(EntityHeaderController mockController) {
+        sMockController = mockController;
+    }
+
+    @Resetter
+    public static void reset() {
+        sMockController = null;
+    }
+
+    @Implementation
+    public static EntityHeaderController newInstance(Activity activity, Fragment fragment,
+            View header) {
+        return sMockController;
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java
new file mode 100644
index 0000000..0af9c30
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParserWrapperImpl.java
@@ -0,0 +1,20 @@
+package com.android.settings.testutils.shadow;
+
+import com.android.settings.fuelgauge.anomaly.KeyValueListParserWrapperImpl;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * Shadow for {@link KeyValueListParserWrapperImpl} so we could implement
+ * {@link #getBoolean(String, boolean)} that doesn't support in the current
+ * robolectric
+ */
+@Implements(KeyValueListParserWrapperImpl.class)
+public class ShadowKeyValueListParserWrapperImpl {
+
+    @Implementation
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return defaultValue;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
index b1419ba..3182a93 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 0000000..8d76063
--- /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 0000000..4f15642
--- /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 0000000..7aa28fa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.settings.testutils.shadow;
+
+import com.android.settings.display.PowerManagerWrapper;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(PowerManagerWrapper.class)
+public class ShadowPowerManagerWrapper {
+
+    @Implementation
+    public int getMinimumScreenBrightnessSetting() {
+        return 0;
+    }
+
+    @Implementation
+    public int getMaximumScreenBrightnessSetting() {
+        return 0;
+    }
+
+    @Implementation
+    public int getMinimumScreenBrightnessForVrSetting() {
+        return 0;
+    }
+
+    @Implementation
+    public int getMaximumScreenBrightnessForVrSetting() {
+        return 0;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java
new file mode 100644
index 0000000..0e0adce
--- /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 0000000..f39f10f
--- /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 64e188e..ce397e4 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
@@ -43,6 +43,13 @@
     }
 
     @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 @@
         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 0000000..e50a769
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+
+import android.content.ContentResolver;
+import android.provider.Settings;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Implements(Settings.System.class)
+public class ShadowSystemSettings {
+
+    private static final Map<String, Object> sValueMap = new HashMap<>();
+
+    @Implementation
+    public static boolean putInt(ContentResolver resolver, String name, int value) {
+        sValueMap.put(name, value);
+        return true;
+    }
+
+    @Implementation
+    public static boolean putString(ContentResolver resolver, String name, String value) {
+        sValueMap.put(name, value);
+        return true;
+    }
+
+    @Implementation
+    public static String getString(ContentResolver resolver, String name) {
+        return (String) sValueMap.get(name);
+    }
+
+    @Implementation
+    public static String getStringForUser(ContentResolver resolver, String name, int userHandle) {
+        return getString(resolver, name);
+    }
+
+    @Implementation
+    public static boolean putIntForUser(ContentResolver cr, String name, int value,
+            int userHandle) {
+        return putInt(cr, name, value);
+    }
+
+    @Implementation
+    public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) {
+        return getInt(cr, name, def);
+    }
+
+    @Implementation
+    public static int getInt(ContentResolver resolver, String name, int defaultValue) {
+        Integer value = (Integer) sValueMap.get(name);
+        return value == null ? defaultValue : value;
+    }
+
+    public static void reset() {
+        sValueMap.clear();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
index c67ad36..860ee11 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 208fae3..8d0df17 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 @@
 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 static void reset() {
         sFingerprintManager = null;
-        sIsCarrierDemoUser = false;
+        sIsDemoUser = false;
     }
 
     @Implementation
@@ -54,12 +56,21 @@
         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/trustagent/TrustAgentFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
index 87f5ecd..b181253 100644
--- a/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/trustagent/TrustAgentFeatureProviderImplTest.java
@@ -20,7 +20,7 @@
 import android.content.pm.ServiceInfo;
 import android.content.pm.PackageManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
index c794cdd..e1bc157 100644
--- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
@@ -20,7 +20,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
index 031cd77..5b31a82 100644
--- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
@@ -24,7 +24,7 @@
 import android.os.UserHandle;
 import android.view.View;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedPreferenceHelper;
 
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index ed95175..a578364 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -21,7 +21,7 @@
 import android.os.UserManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 
diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
index eb5be8f..690c292 100644
--- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
+++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java b/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java
deleted file mode 100644
index 4267ed1..0000000
--- a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.utils;
-
-
-import com.android.settings.TestConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ThreadUtilsTest {
-
-    @Test
-    public void testMainThread() throws InterruptedException {
-        assertThat(ThreadUtils.isMainThread()).isTrue();
-        Thread background = new Thread(new Runnable() {
-            public void run() {
-                assertThat(ThreadUtils.isMainThread()).isFalse();
-            }
-        });
-        background.start();
-        background.join();
-    }
-
-    @Test
-    public void testEnsureMainThread() throws InterruptedException {
-        ThreadUtils.ensureMainThread();
-        Thread background = new Thread(new Runnable() {
-            public void run() {
-                try {
-                    ThreadUtils.ensureMainThread();
-                    fail("Should not pass ensureMainThread in a background thread");
-                } catch (RuntimeException e) {
-                }
-            }
-        });
-        background.start();
-        background.join();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
index 088bfae..4b4f3fb 100644
--- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
@@ -22,7 +22,7 @@
 import android.app.Fragment;
 import android.content.pm.PackageInfo;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
index 582f9fb..2926727 100644
--- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.vpn2;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
index 494492e..dd93938 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
@@ -20,7 +20,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.SubSettings;
 import com.android.settings.TestConfig;
 
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index 655f354..e535445 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -16,20 +16,6 @@
 
 package com.android.settings.webview;
 
-import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -40,10 +26,12 @@
 import android.content.pm.UserInfo;
 import android.os.UserManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.PackageManagerWrapper;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.widget.RadioButtonPreference;
 
 import org.junit.Before;
@@ -58,6 +46,20 @@
 
 import java.util.Arrays;
 
+import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WebViewAppPickerTest {
@@ -87,6 +89,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mActivity);
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
 
         mPicker = new WebViewAppPicker();
@@ -96,7 +99,8 @@
         doReturn(mActivity).when(mPicker).getActivity();
 
         ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-
+        ReflectionHelpers.setField(mPicker, "mMetricsFeatureProvider",
+                mock(MetricsFeatureProvider.class));
         mWvusWrapper = mock(WebViewUpdateServiceWrapper.class);
         mPicker.setWebViewUpdateServiceWrapper(mWvusWrapper);
     }
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
index d32f486..5ce21e8 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
index de097fc..df45ad5 100644
--- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
@@ -23,7 +23,7 @@
 import android.net.wifi.p2p.WifiP2pManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 
diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
new file mode 100644
index 0000000..be50d77
--- /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/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
index cf4be56..7fcf328 100644
--- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.widget;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.After;
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
new file mode 100644
index 0000000..4294dcf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -0,0 +1,347 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.ColorDrawable;
+import android.os.UserHandle;
+import android.support.v7.preference.Preference;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.internal.logging.nano.MetricsProto;
+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 org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EntityHeaderControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Activity mActivity;
+    @Mock
+    private Fragment mFragment;
+
+    private Context mShadowContext;
+    private LayoutInflater mLayoutInflater;
+    private PackageInfo mInfo;
+    private EntityHeaderController mController;
+    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();
+        mInfo.versionName = "1234";
+    }
+
+    @Test
+    public void testBuildView_constructedWithoutView_shouldCreateNewView() {
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+        View view = mController.done(mActivity);
+
+        assertThat(view).isNotNull();
+    }
+
+    @Test
+    public void testBuildView_withContext_shouldBuildPreference() {
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+        Preference preference = mController.done(mActivity, mShadowContext);
+
+        assertThat(preference instanceof LayoutPreference).isTrue();
+    }
+
+    @Test
+    public void testBuildView_constructedWithView_shouldReturnSameView() {
+        View inputView = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
+        View view = mController.done(mActivity);
+
+        assertThat(view).isSameAs(inputView);
+    }
+
+    @Test
+    public void bindViews_shouldBindAllData() {
+        final String testString = "test";
+        final View header = mLayoutInflater.inflate(
+                R.layout.settings_entity_header, null /* root */);
+        final TextView label = header.findViewById(R.id.entity_header_title);
+        final TextView version = header.findViewById(R.id.entity_header_summary);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
+        mController.setLabel(testString);
+        mController.setSummary(testString);
+        mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
+        mController.done(mActivity);
+
+        assertThat(label.getText()).isEqualTo(testString);
+        assertThat(version.getText()).isEqualTo(testString);
+    }
+
+    @Test
+    public void bindButton_hasAppPref_shouldShowButton() {
+        final ResolveInfo info = new ResolveInfo();
+        info.activityInfo = new ActivityInfo();
+        info.activityInfo.packageName = "123";
+        info.activityInfo.name = "321";
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mActivity.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
+                .thenReturn(info);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setButtonActions(
+                EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
+                EntityHeaderController.ActionType.ACTION_NONE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+        try {
+            appLinks.findViewById(android.R.id.button1).performClick();
+        } catch (Exception e) {
+            // Ignore exception because the launching intent is fake.
+        }
+        verify(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.settings_entity_header, null /* root */);
+        when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
+                .thenReturn(null);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setButtonActions(
+                EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
+                EntityHeaderController.ActionType.ACTION_NONE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.GONE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void bindButton_noAppInfo_shouldNotShowButton() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setPackageName(null)
+                .setButtonActions(
+                        EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NONE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.GONE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void bindButton_hasAppInfo_shouldShowButton() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setPackageName("123")
+                .setUid(UserHandle.USER_SYSTEM)
+                .setButtonActions(
+                        EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void bindButton_hasAppInfo_shouldHaveContentDescription() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+        when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setPackageName("123")
+                .setUid(UserHandle.USER_SYSTEM)
+                .setButtonActions(
+                        EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getContentDescription().toString())
+                .isEqualTo("App info");
+    }
+
+    @Test
+    public void iconContentDescription_shouldWorkWithSetIcon() {
+        final View view = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
+        String description = "Fake Description";
+        mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
+        mController.setIconContentDescription(description);
+        mController.done(mActivity);
+        assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())
+                .isEqualTo(description);
+    }
+
+    @Test
+    public void iconContentDescription_shouldWorkWithoutSetIcon() {
+        final View view = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mFragment.getActivity()).thenReturn(mock(Activity.class));
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
+        String description = "Fake Description";
+        mController.setIconContentDescription(description);
+        mController.done(mActivity);
+        assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())
+                .isEqualTo(description);
+    }
+
+    @Test
+    public void bindButton_hasAppNotifIntent_shouldShowButton() {
+        final View appLinks = mLayoutInflater
+                .inflate(R.layout.settings_entity_header, null /* root */);
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
+        mController.setAppNotifPrefIntent(new Intent())
+                .setButtonActions(
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
+                        EntityHeaderController.ActionType.ACTION_NONE);
+        mController.done(mActivity);
+
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    // Ensure that the instant app label does not show up when we haven't told the controller the
+    // app is instant.
+    @Test
+    public void instantApps_normalAppsDontGetLabel() {
+        final View header = mLayoutInflater.inflate(
+                R.layout.settings_entity_header, null /* root */);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
+        mController.done(mActivity);
+
+        assertThat(header.findViewById(R.id.install_type).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    // Test that the "instant apps" label is present in the header when we have an instant app.
+    @Test
+    public void instantApps_expectedHeaderItem() {
+        final View header = mLayoutInflater.inflate(
+                R.layout.settings_entity_header, null /* root */);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
+        mController.setIsInstantApp(true);
+        mController.done(mActivity);
+        TextView label = header.findViewById(R.id.install_type);
+
+        assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(label.getText()).isEqualTo(
+                header.getResources().getString(R.string.install_type_instant));
+        assertThat(header.findViewById(R.id.entity_header_summary).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void styleActionBar_invalidObjects_shouldNotCrash() {
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+        mController.styleActionBar(null);
+
+        when(mActivity.getActionBar()).thenReturn(null);
+        mController.styleActionBar(mActivity);
+
+        verify(mActivity).getActionBar();
+    }
+
+    @Test
+    public void styleActionBar_setElevationAndBackground() {
+        final ActionBar actionBar = mActivity.getActionBar();
+
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+        mController.styleActionBar(mActivity);
+
+        verify(actionBar).setElevation(0);
+        // Enforce a color drawable as background here, as image based drawables might not be
+        // wide enough to cover entire action bar.
+        verify(actionBar).setBackgroundDrawable(any(ColorDrawable.class));
+    }
+
+    @Test
+    public void initAppHeaderController_appHeaderNull_useFragmentContext() {
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
+
+        // Fragment.getContext() is invoked to inflate the view
+        verify(mFragment).getContext();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
new file mode 100644
index 0000000..0d9a77b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class FixedLineSummaryPreferenceTest {
+
+    @Mock
+    private TextView mSummary;
+
+    private Context mContext;
+    private PreferenceViewHolder mHolder;
+    private FixedLineSummaryPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mPreference = new FixedLineSummaryPreference(mContext, null);
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View view = inflater.inflate(mPreference.getLayoutResource(),
+                new LinearLayout(mContext), false);
+        mHolder = spy(PreferenceViewHolder.createInstanceForTests(view));
+        when(mHolder.findViewById(android.R.id.summary)).thenReturn(mSummary);
+    }
+
+    @Test
+    public void onBindViewHolder_shouldSetSingleLine() {
+        mPreference.onBindViewHolder(mHolder);
+
+        verify(mSummary).setMinLines(1);
+        verify(mSummary).setMaxLines(1);
+    }
+
+    @Test
+    public void onBindViewHolder_TwoLineSummary_shouldSetTwoLines() {
+        mPreference.setSummaryLineCount(2);
+        mPreference.onBindViewHolder(mHolder);
+
+        verify(mSummary).setMinLines(2);
+        verify(mSummary).setMaxLines(2);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java b/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java
deleted file mode 100644
index 21ebb25..0000000
--- a/tests/robotests/src/com/android/settings/widget/FooterPreferenceMixinTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FooterPreferenceMixinTest {
-
-    @Mock
-    private PreferenceFragment mFragment;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private Lifecycle mLifecycle;
-    private FooterPreferenceMixin mMixin;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mLifecycle = new Lifecycle();
-        when(mFragment.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        when(mFragment.getPreferenceManager().getContext())
-                .thenReturn(ShadowApplication.getInstance().getApplicationContext());
-        mMixin = new FooterPreferenceMixin(mFragment, mLifecycle);
-    }
-
-    @Test
-    public void createFooter_screenNotAvailable_noCrash() {
-        assertThat(mMixin.createFooterPreference()).isNotNull();
-    }
-
-    @Test
-    public void createFooter_screenAvailable_canAttachToScreen() {
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-
-        final FooterPreference preference = mMixin.createFooterPreference();
-
-        assertThat(preference).isNotNull();
-        verify(mScreen).addPreference(preference);
-    }
-
-    @Test
-    public void createFooter_screenAvailableDelayed_canAttachToScreen() {
-        final FooterPreference preference = mMixin.createFooterPreference();
-
-        mLifecycle.setPreferenceScreen(mScreen);
-
-        assertThat(preference).isNotNull();
-        verify(mScreen).addPreference(preference);
-    }
-
-    @Test
-    public void createFooterTwice_screenAvailable_replaceOldFooter() {
-        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-
-        mMixin.createFooterPreference();
-        mMixin.createFooterPreference();
-
-        verify(mScreen).removePreference(any(FooterPreference.class));
-        verify(mScreen, times(2)).addPreference(any(FooterPreference.class));
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java
deleted file mode 100644
index 885ac68..0000000
--- a/tests/robotests/src/com/android/settings/widget/FooterPreferenceTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.content.Context;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.text.method.LinkMovementMethod;
-import android.view.LayoutInflater;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class FooterPreferenceTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = ShadowApplication.getInstance().getApplicationContext();
-    }
-
-    @Test
-    public void createNewPreference_shouldSetKeyAndOrder() {
-        final FooterPreference preference = new FooterPreference(mContext);
-
-        assertThat(preference.getKey()).isEqualTo(FooterPreference.KEY_FOOTER);
-        assertThat(preference.getOrder()).isEqualTo(FooterPreference.ORDER_FOOTER);
-    }
-
-    @Test
-    public void bindPreference_shouldLinkifyContent() {
-        final FooterPreference preference = new FooterPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(R.layout.preference_footer, null));
-
-        preference.onBindViewHolder(holder);
-        assertThat(((TextView) holder.findViewById(android.R.id.title)).getMovementMethod())
-                .isInstanceOf(LinkMovementMethod.class);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
index 21dc038..1c449cc 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
@@ -25,7 +25,7 @@
 import android.widget.Switch;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
index e6d00b3..e314ef3 100644
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
@@ -16,21 +16,15 @@
 
 package com.android.settings.widget;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import android.app.Activity;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.defaultapps.DefaultAppInfo;
-import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
+import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,6 +38,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class RadioButtonPickerFragmentTest {
@@ -61,6 +61,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mActivity);
         mFragment = spy(new TestFragment());
 
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
@@ -72,7 +73,6 @@
     public void onAttach_userIsInitialized() {
         mFragment.onAttach((Context) mActivity);
 
-        verify(mActivity).getPackageManager();
         verify(mActivity).getSystemService(Context.USER_SERVICE);
     }
 
@@ -99,7 +99,7 @@
         assertThat(mFragment.setDefaultKeyCalled).isTrue();
     }
 
-    public static class TestFragment extends DefaultAppPickerFragment {
+    public static class TestFragment extends RadioButtonPickerFragment {
 
         boolean setDefaultKeyCalled;
 
diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
index 1a7161c..a1a2f24 100644
--- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.view.View.MeasureSpec;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
index da7b092..ea27d05 100644
--- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
@@ -21,7 +21,7 @@
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowTextUtils;
 import java.util.Locale;
diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
new file mode 100644
index 0000000..5755015
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.RuntimeEnvironment.application;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.graphics.Rect;
+import android.widget.FrameLayout;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowView;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ScrollToParentEditTextTest {
+
+    private static final int EDIT_TEXT_SIZE = 20;
+    private static final int PARENT_SIZE = 50;
+    private static final int SCROLL_RECT_SIZE = 30;
+
+    private ScrollToParentEditText mEditText;
+    private FrameLayout mParent;
+
+    @Before
+    public void setUp() {
+        mEditText = new ScrollToParentEditText(
+                application,
+                Robolectric.buildAttributeSet().build());
+        mEditText.layout(0, 0, EDIT_TEXT_SIZE, EDIT_TEXT_SIZE);
+
+        mParent = spy(new FrameLayout(application));
+        mParent.layout(0, 0, PARENT_SIZE, PARENT_SIZE);
+
+        doReturn(true).when(mParent).requestRectangleOnScreen(any(Rect.class), anyBoolean());
+    }
+
+    @Test
+    public void requestRectangleOnScreen_noParent_shouldScrollToItself() {
+        assertThat(mEditText.requestRectangleOnScreen(
+                new Rect(0, 0, SCROLL_RECT_SIZE, SCROLL_RECT_SIZE), true)).isFalse();
+    }
+
+    @Test
+    public void requestRectangleOnScreen_withParent_shouldScrollToParent() {
+        ShadowView shadowEditText = shadowOf(mEditText);
+        shadowEditText.setMyParent(mParent);
+
+        assertThat(mEditText.requestRectangleOnScreen(
+                new Rect(0, 0, SCROLL_RECT_SIZE, SCROLL_RECT_SIZE), true)).isTrue();
+        verify(mParent)
+                .requestRectangleOnScreen(eq(new Rect(0, 0, PARENT_SIZE, PARENT_SIZE)), eq(true));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
index e57d25a..2f42550 100644
--- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
@@ -18,14 +18,12 @@
 
 import android.content.Context;
 
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -34,7 +32,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
index bf564a5..415cd92 100644
--- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.net.wifi.WifiManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
index 96cb217..9321827 100644
--- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
@@ -27,7 +27,7 @@
 
 import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
index 75b304e..b83a3e3 100644
--- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
@@ -28,9 +28,9 @@
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
index 5b55006..a76b82a 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 @@
 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.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.network.NetworkScoreManagerWrapper;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.R;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.network.NetworkScoreManagerWrapper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.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 @@
                 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() {
+    public void testIsAvailable_returnsFalseWhenScorersNotSupported() {
+        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY));
+        createController();
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    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()).isFalse();
-    }
-
-    @Test
-    public void testIsAvailable_enableActivityExists() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
-
         createController();
 
         assertThat(mController.isAvailable()).isTrue();
@@ -117,8 +140,6 @@
 
     @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 @@
 
     @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 @@
 
     @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 @@
 
     @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 @@
 
     @Test
     public void onActivityResult_matchingRequestCode_nonOkResult_shouldDoNothing() {
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         createController();
 
         assertThat(mController
@@ -182,7 +205,7 @@
 
     @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 @@
     }
 
     @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 @@
 
         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 2e57781..b45ea1e 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -23,7 +23,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 import com.android.settingslib.wifi.AccessPoint;
@@ -44,10 +44,14 @@
         shadows = ShadowConnectivityManager.class)
 public class WifiConfigControllerTest {
 
-    @Mock private WifiConfigUiBase mConfigUiBase;
-    @Mock private Context mContext;
-    @Mock private View mView;
-    @Mock private AccessPoint mAccessPoint;
+    @Mock
+    private WifiConfigUiBase mConfigUiBase;
+    @Mock
+    private Context mContext;
+    @Mock
+    private View mView;
+    @Mock
+    private AccessPoint mAccessPoint;
 
     public WifiConfigController mController;
 
@@ -73,6 +77,38 @@
         mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
                 WifiConfigUiBase.MODE_CONNECT);
     }
+
+    @Test
+    public void ssidExceeds32Bytes_shouldShowSsidTooLongWarning() {
+        mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
+                WifiConfigUiBase.MODE_CONNECT);
+        final TextView ssid = mView.findViewById(R.id.ssid);
+        ssid.setText("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎");
+        mController.showWarningMessagesIfAppropriate();
+
+        assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void ssidShorterThan32Bytes_shouldNotShowSsidTooLongWarning() {
+        mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
+                WifiConfigUiBase.MODE_CONNECT);
+
+        final TextView ssid = mView.findViewById(R.id.ssid);
+        ssid.setText("123456789012345678901234567890");
+        mController.showWarningMessagesIfAppropriate();
+
+        assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
+                .isEqualTo(View.GONE);
+
+        ssid.setText("123");
+        mController.showWarningMessagesIfAppropriate();
+
+        assertThat(mView.findViewById(R.id.ssid_too_long_warning).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
     @Test
     public void isSubmittable_noSSID_shouldReturnFalse() {
         final TextView ssid = mView.findViewById(R.id.ssid);
@@ -87,13 +123,14 @@
         assertThat(mController.isSubmittable()).isFalse();
 
     }
+
     @Test
     public void isSubmittable_shortPsk_shouldReturnFalse() {
         final TextView password = mView.findViewById(R.id.password);
         password.setText(SHORT_PSK);
         assertThat(mController.isSubmittable()).isFalse();
-
     }
+
     @Test
     public void isSubmittable_goodPsk_shouldReturnTrue() {
         final TextView password = mView.findViewById(R.id.password);
@@ -101,6 +138,7 @@
         assertThat(mController.isSubmittable()).isTrue();
 
     }
+
     @Test
     public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
         final TextView password = mView.findViewById(R.id.password);
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
index 5646470..c7647ba 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -20,7 +20,7 @@
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.widget.SwitchWidgetController;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
index 40c480f..1650816 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
@@ -23,9 +23,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
index 694fe0e..307cccb 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
@@ -20,12 +20,10 @@
 import android.content.Context;
 import android.content.IntentFilter;
 import android.net.wifi.WifiManager;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -43,7 +41,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
index 967da08..4507e54 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
@@ -23,7 +23,7 @@
 import android.net.wifi.WifiManager;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settingslib.wifi.WifiStatusTracker;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 61981c4..8be686e 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 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.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
+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 @@
         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 @@
         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 ac0861e..94cc46b 100644
--- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
@@ -31,9 +31,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
index 000f2fa..41b71ad 100644
--- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
@@ -22,10 +22,9 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.net.wifi.WifiManager;
 import android.view.inputmethod.InputMethodManager;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowNfcAdapter;
 
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index 5c1b103..9c1e70c 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 @@
 
 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.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.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;
@@ -76,7 +81,6 @@
 import org.robolectric.annotation.Config;
 
 import java.net.Inet4Address;
-import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
@@ -84,7 +88,8 @@
 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;
@@ -108,7 +113,12 @@
     @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;
@@ -200,7 +210,7 @@
         when(mockConnectivityManager.getNetworkInfo(any(Network.class)))
                 .thenReturn(mockNetworkInfo);
         doNothing().when(mockConnectivityManagerWrapper).registerNetworkCallback(
-                any(NetworkRequest.class), mCallbackCaptor.capture(), any(Handler.class));
+                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
         doNothing().when(mockForgetButton).setOnClickListener(mForgetClickListener.capture());
 
         when(mockWifiInfo.getLinkSpeed()).thenReturn(LINK_SPEED);
@@ -214,6 +224,12 @@
 
         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();
     }
@@ -233,8 +249,11 @@
     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))
@@ -303,7 +322,7 @@
         displayAndResume();
 
         verify(mockConnectivityManagerWrapper, times(1)).registerNetworkCallback(
-                any(NetworkRequest.class), mCallbackCaptor.capture(), any(Handler.class));
+                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
     }
 
     @Test
@@ -316,23 +335,33 @@
     }
 
     @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 connectionDetailPref_shouldHaveTitleSet() {
+    public void entityHeader_shouldHaveLabelSetToSsid() {
+        String label = "ssid";
+        when(mockAccessPoint.getSsidStr()).thenReturn(label);
+
+        displayAndResume();
+
+        verify(mockHeaderController).setLabel(label);
+    }
+
+    @Test
+    public void entityHeader_shouldHaveSummarySet() {
         String summary = "summary";
         when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
 
         displayAndResume();
 
-        verify(mockConnectionDetailPref).setTitle(summary);
+        verify(mockHeaderController).setSummary(summary);
     }
 
     @Test
@@ -537,33 +566,33 @@
         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
@@ -720,6 +749,8 @@
         verify(mockSignInButton).setOnClickListener(captor.capture());
         captor.getValue().onClick(mockSignInButton);
         verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork);
+        verify(mockMetricsFeatureProvider)
+                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
new file mode 100644
index 0000000..dd2ef52
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.p2p;
+
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class P2pCategoryPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PreferenceCategory mCategory;
+    private P2pCategoryPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mPreferenceScreen.findPreference(anyString())).thenReturn(mCategory);
+
+        mController = new P2pCategoryPreferenceController(RuntimeEnvironment.application) {
+
+            @Override
+            public String getPreferenceKey() {
+                return "test_key";
+            }
+        };
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+
+    @Test
+    public void removeAllChildren_shouldRemove() {
+        mController.removeAllChildren();
+
+        verify(mCategory).removeAll();
+        verify(mCategory).setVisible(false);
+    }
+
+    @Test
+    public void addChild_shouldAdd() {
+        final Preference pref = new Preference(RuntimeEnvironment.application);
+        mController.addChild(pref);
+
+        verify(mCategory).addPreference(pref);
+        verify(mCategory).setVisible(true);
+    }
+
+    @Test
+    public void shouldToggleEnable() {
+        mController.setEnabled(false);
+
+        verify(mCategory).setEnabled(false);
+
+        mController.setEnabled(true);
+
+        verify(mCategory).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
new file mode 100644
index 0000000..62fd01f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.p2p;
+
+
+import android.net.wifi.p2p.WifiP2pDevice;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class P2pThisDevicePreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private Preference mPreference;
+    private P2pThisDevicePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        when(mPreferenceScreen.findPreference(anyString())).thenReturn(mPreference);
+
+        mController = new P2pThisDevicePreferenceController(RuntimeEnvironment.application);
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateDeviceName_emptyName_shouldUseIpAddress() {
+        WifiP2pDevice device = new WifiP2pDevice();
+        device.deviceAddress = "address";
+        mController.displayPreference(mPreferenceScreen);
+        mController.updateDeviceName(device);
+
+        assertThat(mPreference.getTitle()).isEqualTo(device.deviceAddress);
+    }
+
+    @Test
+    public void updateDeviceName_hasName_shouldUseName() {
+        WifiP2pDevice device = new WifiP2pDevice();
+        device.deviceAddress = "address";
+        device.deviceName = "name";
+        mController.displayPreference(mPreferenceScreen);
+        mController.updateDeviceName(device);
+
+        assertThat(mPreference.getTitle()).isEqualTo(device.deviceName);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
index 06caadf..8946a5e 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -30,9 +30,9 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/unit/AndroidTest.xml b/tests/unit/AndroidTest.xml
index 80a5a73..b74c1e3 100644
--- a/tests/unit/AndroidTest.xml
+++ b/tests/unit/AndroidTest.xml
@@ -20,7 +20,7 @@
 
     <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="SettingsUnitTests" />
-    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.settings.tests.unit" />
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
     </test>
diff --git a/tests/unit/src/com/android/settings/ChooseLockSettingsHelperTest.java b/tests/unit/src/com/android/settings/ChooseLockSettingsHelperTest.java
deleted file mode 100644
index 218a74e..0000000
--- 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 70087ae..b1d94d4 100644
--- a/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
+++ b/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
@@ -16,6 +16,25 @@
 
 package com.android.settings;
 
+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;
@@ -23,28 +42,19 @@
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static junit.framework.Assert.fail;
 
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class 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 @@
                 .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 0000000..5e5e143
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import android.app.Instrumentation;
+import android.os.Bundle;
+import android.os.Looper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.settings.Settings.AccessibilitySettingsActivity;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ToggleFeaturePreferenceFragmentTest {
+    private static final String SUMMARY_TEXT = "Here's some summary text";
+
+    @Rule
+    public final ActivityTestRule<AccessibilitySettingsActivity> mActivityRule =
+            new ActivityTestRule<>(AccessibilitySettingsActivity.class, true);
+
+    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+
+    @BeforeClass
+    public static void oneTimeSetup() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+    }
+
+    @Before
+    public void setUp() {
+        mInstrumentation.runOnMainSync(() -> {
+            MyToggleFeaturePreferenceFragment fragment = new MyToggleFeaturePreferenceFragment();
+            Bundle args = new Bundle();
+            args.putString(AccessibilitySettings.EXTRA_SUMMARY, SUMMARY_TEXT);
+            fragment.setArguments(args);
+            mActivityRule.getActivity().startPreferenceFragment(fragment, false);
+        });
+    }
+
+    @Test
+    public void testSummaryTestDisplayed() {
+        onView(withText(SUMMARY_TEXT)).check(matches(isDisplayed()));
+    }
+
+    public static class MyToggleFeaturePreferenceFragment extends ToggleFeaturePreferenceFragment {
+        @Override
+        protected void onPreferenceToggled(String preferenceKey, boolean enabled) {}
+
+        @Override
+        public int getMetricsCategory() {
+            return 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java
new file mode 100644
index 0000000..e074966
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/ManageApplicationsLaunchTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ManageApplicationsLaunchTest {
+
+    private Instrumentation mInstrumentation;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    }
+
+    @Test
+    public void launchAppsSettings_shouldShowAppList() throws Exception {
+        final Intent appsSettingsIntent = new
+                Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS);
+
+        mInstrumentation.startActivitySync(appsSettingsIntent);
+
+        onView(allOf(withText("Calculator"))).check(matches(isDisplayed()));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
similarity index 83%
rename from tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
rename to tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
index d207701..ce8603b 100644
--- a/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
+++ b/tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
@@ -16,11 +16,9 @@
 
 package com.android.settings.applications;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-
 import android.content.pm.ApplicationInfo;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
@@ -30,8 +28,14 @@
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 import java.lang.reflect.Field;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class ManageApplicationsTest {
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ManageApplicationsUnitTest {
     @Test
     public void getCompositeFilter_filtersVolumeForAudio() {
         AppFilter filter =
@@ -112,4 +116,20 @@
 
         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 95%
rename from tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java
rename to tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
index 22723a6..16e309d 100644
--- a/tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java
+++ b/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
@@ -58,8 +58,7 @@
     @Test
     public void startPhoneStatus_preferenceIconSpaceReserved() throws InterruptedException {
         launchPhoneStatus();
-        onView(withId(R.id.icon_frame)).check(doesNotExist());
-        onView(withFirstId(R.id.icon_container)).check(matches(isDisplayed()));
+        onView(withFirstId(R.id.icon_frame)).check(matches(isDisplayed()));
     }
 
     @Test
diff --git a/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java b/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java
new file mode 100644
index 0000000..497fa0a
--- /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 8afed18..0000000
--- 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 0000000..8be3320
--- /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 26b097e..8a7e3fe 100644
--- a/tests/unit/src/com/android/settings/search/SearchActivityTest.java
+++ b/tests/unit/src/com/android/settings/search/SearchActivityTest.java
@@ -25,7 +25,6 @@
 import android.support.test.runner.AndroidJUnit4;
 
 import com.android.settings.Settings;
-import com.android.settings.search2.SearchActivity;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
index 3c464a7..cbd9546 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.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.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 @@
 
 @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 @@
         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 @@
         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 @@
         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 @@
 
     private void callOnWifiStateChanged(int state) {
         mActivityRule.getActivity().getMainThreadHandler()
-                .post( () -> mWifiListener.onWifiStateChanged(state) );
+                .post(() -> mWifiListener.onWifiStateChanged(state));
     }
 
     @Test
@@ -156,17 +188,30 @@
     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 @@
 
         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 @@
         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 @@
         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 @@
 
         launchActivity();
 
-        onView(withText(CONNECTED)).check(matches(isDisplayed()));
+        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
+                matches(isDisplayed()));
     }
 
     @Test
@@ -219,7 +267,8 @@
 
         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 @@
         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()));
+    }
 }